Discussion about merging

[Erik Bågfors]

> I don't know if merge will properly merge ancestry for you. As I think
> the interior revision-id will be different. However, because of the
> unique identifiers, you can actually undo one of the commits, merge the
> other commit, and then replay the original commit. Then just replay that
> last commit on the other branch, and they are back to having identical
> history.


This is one of the things I would LOVE to see.  This would allow me to
just hack in one branch, commit, pull, keep hacking, etc.  This is one
of the things that makes darcs to user friendly.

However, I don't quite understand how you should solve conflicts in this case.

undo one commit (or several),
pull from upstream,
try replay the commit, gives conflict,  solve conflict, keep replaying
(ie, commit).

I don't understand how that last line would be done

Cheers,
Erik