The rebase command should do firstly all the merges and _then_ all the reverts.
The attached rebase session fails (with unnecessary merge conflicts) when the
rebasing changesets modifies the same lines.