On Mon, Sep 29, 2008 at 05:07:22PM +0200, Miklos Vajna <vmiklos@xxxxxxxxxxxxxx> wrote: > > Currently parents of merge commits are 'reduce(HEAD + MERGE_HEAD)' > > in symbolic equation; I propose they would be simply 'MERGE_HEAD'. > > then we set this branch to new commit > > Yes. Currently - after a merge conflict - you are able to check what > heads caused were merged, which caused the conflict, but with this > approach you would not be able to. I think this would be a step back... Uh, I should read my mail before sending it next time. I just wanted to say that in case, for example, I merge A^ and A, but I get a conflict after octopus tried to merge A^ then it can be a useful info to see that A^ was a head. Putting reduce(HEAD + MERGE_HEAD) to MERGE_HEAD would hide this info, which would make the situation worse, IMHO.
Attachment:
pgpGLJYNSHoz1.pgp
Description: PGP signature
