title: Why does the same conflict reappear when I use git rebase?
body: <p>I have read relevant questions about git merge and git rebase on SO, but I still cannot fully understand what is happening under the hood.</p>
  <p>Here is our branching situation:</p>
  <pre><code>MASTER------------------------
          \        \
           \        \----Feature B---
            \                        \
             \-----Feature A----------\---Feature A+B
  </code></pre>
  <p>Given 2 feature branches that stem from master at different times, we now want to combine the 2 branches. We want to follow the <code>first rebase then merge</code> practice, but when we rebase Feature A onto Feature B, we get conflicts. That's expected, because both features (and master) have changes in the same areas. But the strange thing is that the same conflict keeps reappearing after <code>git rebase --continue</code>. This drives us crazy, so we end up aborting the rebase, and use <code>git merge</code>. It turns out the conflicts are actually easy to resolve.</p>
  <p>My question is two-fold:</p>
  <ol>
  <li>Is <code>git rebase</code> suitable for our situation? Or is rebase only good for pulling in a few (e.g., 1 or 2) changes?</li>
  <li>What is happening under the hood that causes the same conflict to reappear again and again? My understanding is <code>rebase</code> resolves conflicts one at a time, but which commit does it compare, and what does it compare it to?</li>
  </ol>
  <p>Relavant posts on SO:</p>
  <ul>
  <li><a href="https://stackoverflow.com/questions/13825079/git-rebase-why-i-have-to-resolve-the-same-conflict-over-and-over">Why do I have to resolve the same conflict over and over?</a></li>
  <li><a href="https://stackoverflow.com/questions/7241678/how-to-prevent-lot-of-git-conflicts-when-git-rebasing-lot-of-commits%5C">https://stackoverflow.com/questions/7241678/how-to-prevent-lot-of-git-conflicts-when-git-rebasing-lot-of-commits\</a></li>
  <li><a href="https://stackoverflow.com/questions/3516899/git-rebase-resolve-conflicts-again-and-again">git rebase resolve conflicts again and again?</a></li>
  </ul>