title: Why do I have to resolve the same "git rebase" conflict over and over?
body: <p>When I do <code>git rebase branch1</code> in my <code>branch1-local</code> I get conflicts. I solve the conflict, do <code>git add &lt;conflicted-add&gt;</code> and then do <code>git rebase --continue</code> as git asks me to do. After that a new commit is applied. A new conflict shows up. But is the same conflict again in the same file. I do it again, <code>git add</code>, the <code>git rebase --continue</code>, and then it all repeats again until I repeat this for each commit being rebased on.</p>
  <p>Why rebase is having me redo the same conflict resolution over and over again?</p>