title: How to resolve merge conflict during pull request?
body: <p>We generally have individual branches off of master. So for example we have a branch named "JohnMaster". John does his development locally off of JohnMaster and when he is ready to push his code to master he pushes his branch to remote and then does a pull request to master from JohnMaster. The problem were running into is we have conflicts when doing the pull request. </p>
  
  <p>The way i thought we could resolve the merge conflict was to bring master down and the do a rebase locally from master-->JohnMaster and then resolve the merge conflict during the rebase. After doing the rebase it wouldn't let me push my code back up to remote because it said i was 2 commits off of remote (before the rebase they were identical)  but when i do a <code>git pull</code> i get another merge conflict. </p>
  
  <p>I know probably the best practice is to do a pull request from master-->JohnMaster (reverse merge) and then do a <code>git pull</code> when on JohnMaster before you ever push your commits up to remote but sometimes people forget and then we run into this issue. </p>
  
  <p>So my questions are:</p>
  
  <ol>
  <li>Why does rebasing locally not work?</li>
  <li>How can we get around this issue?</li>
  </ol>
  
  <p>Please note we can't commit directly to master. There is security on the branch that requires pull requests.</p>