reassign 426938 git found 426938 git/1:1.7.1-1 tags 426938 + upstream quit Hi Bart,
Sorry for the long silence. Bart Massey wrote: > 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. Wait --- why? Conflict markers are supposed to be ephemeral things: in order for the merge to be sanely resolved, the conflict markers should be replaced with a version reconciling the two changes. Example: git init /tmp/foo && cd /tmp/foo && git commit --allow-empty -m root && git checkout -b branch && echo this way is better >the-way.txt && git add -A && git commit -m 'one way' && git checkout master && echo no, this way is better >the-way.txt && git add -A && git commit -m 'other way' && ! git merge branch && cat the-way.txt produces <<<<<<< HEAD no, this way is better ======= this way is better >>>>>>> branch but if I try to ‘git commit’, I get: U the-way.txt fatal: 'commit' is not possible because you have unmerged files. I would be willing to write a patch to make conflict hunks unconditionally include a commit id, but I am not sure yet whether the added characters would be just noise. Regards, Jonathan -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
