[hazbot]

It's because git replays your commits one at a time on top of a new commit; so if you resolve a conflict but then your next commits also touches the same code, the intent is ambiguous to git and it asks for your help with the conflict.

Wsc891 https://news.ycombinator.com/user?id=wsc981 has a good resolution for this in the comment directly above: 1) rebase -i onto your own history and squash 2) rebase onto the new branch.