title: Fixing merge conflicts with git flow
body: <p>I'm using the following flow: There's master, test and feature branches. Feature branches are branched from master. Pull requests are made from feature branches to test and then (when approved) from the feature branch to master. Whenever I make pull request from feature to test, there's a chance a merge conflict occurs. I would like to fix this conflict locally..</p>
  
  <p>My way of doing this is merging the test branch to my feature branch (locally), fix the conflict, and push the merge. Then the pull request is fixed. HOWEVER, this causes <strong>ALL changes (features) from the test branch to come along when I create a PR from that feature branch to master</strong>. This is of course not what I want, since some of those features haven't been tested yet.</p>
  
  <p>What is the best way to fix merge conflicts (locally) without merging the test branch to my feature branch (causing this issue)? </p>