title: Git merge child back to parent... both files conflict
body: <p>So I started by branching to a new branch from master:</p>
  
  <p><code>git checkout -b branchA</code></p>
  
  <p>While in <code>branchA</code> I branched to <code>branchB</code> because I wanted the changes in <code>branchA</code> already.</p>
  
  <p>When I got done with <code>branchB</code> I wanted to fold the changes back to <code>branchA</code>. What I found was that all the files that I had touched in <code>branchA</code> but not in <code>branchB</code> were now in conflict with itself - the lines that were changed in <code>branchA</code> now show up as conflicts after I did a <code>git merge branchB</code> from <code>branchA</code>.</p>
  
  <p>What's the proper way to merge these changes?</p>
  
  <p>By the way I have already pushed to remote, so I don't know if rebase will work here.</p>