Johannes Sixt <[email protected]> writes: > The recent rewrite of the 'git merge' invocation in b5f325cb > (git-gui: stop using deprecated merge syntax) replaced the > subsidiary call of 'git fmt-merge-msg' to take advantage of > the capability of 'git merge' that can construct a merge log > message when the rev being merged is FETCH_HEAD. > > A disadvantage of this method is, though, that the conflict > markers are augmented with a raw SHA1 instead of a symbolic > branch name.
Can't this be handled on the "git merge FETCH_HEAD" codepath instead? The codepath already does enough "magic" things to FETCH_HEAD like skipping 'not-for-merge' entries and also knows about the original refnames the commits to be merged came from.
