title: How to fix merge conflicts without a merge or rebase using --no-commit
body: <p>For better or worse I'm working with a setup that has master, release and develop branches. We branch off master and merge into develop. Branches that pass QA are then merged into a release branch, testing on staging, them merged into master.</p>
  
  <p>When there's a conflict between a feature branch and develop we can't do a merge or rebase as that will get a bunch of stuff from develop into the feature branch that isn't ready to be deployed.</p>
  
  <p>Is this a sensible process?</p>
  
  <ol>
  <li>get latest develop branch</li>
  <li>checkout feature branch</li>
  <li>run <code>git merge --no-ff --no-commit develop</code></li>
  <li>fix conflicts</li>
  <li><code>git merge --continue</code></li>
  <li>when it finishes push the feature branch for a PR</li>
  </ol>