Hmmm I think in your scenario you could avoid resolving the conflict 10 times by using `git rebase --onto` Suppose "masterX+1" is called latest Suppose "maste

Hmmm I think in your scenario you could avoid resolving the conflict 10 times by using `git rebase --onto` Suppose "masterX+1" is called latest Suppose "masterX" is the SHA of your mergebase with master (on top of which you have 10 commits) `git rebase --onto latest masterX`