tags 426938 + moreinfo quit Hi again,
4 years ago, Bart Massey wrote[1]: > As of now, the conflict markers generated by merges > sometimes include only a relative symbolic name such as > "HEAD". A SHA1 should also always be included, so that > months later the marker is still meaningful. My response was that it is not obvious what that would buy, given that conflict markers are supposed to be ephemeral things that do not make it into permanent history. That is, in order to change HEAD, you would need to run "git merge --abort" or "git reset --merge" first anyway. The conflict labels should be easy to change given a reason to do so, so I'm marking the bug accordingly. Thanks for your work. Jonathan [1] http://bugs.debian.org/426938 -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
