From 6b94f1e404afc552e5139c4357331843f5be61ad Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 27 Jan 2006 23:05:05 -0800 Subject: [PATCH] merge: seed the commit message with list of conflicted files. The files with conflicts need to be hand resolved, and it is a good discipline for the committer to explain which branch was taken and why. Pre-fill the merge message template with the list of conflicted paths to encourage it. This is from Linus. Signed-off-by: Junio C Hamano --- git-merge.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/git-merge.sh b/git-merge.sh index 0a158ef77..92e5a65ca 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -301,5 +301,13 @@ then "Automatic merge went well; stopped before committing as requested" exit 0 else + { + echo ' +Conflicts: +' + git ls-files --unmerged | + sed -e 's/^[^ ]* / /' | + uniq + } >>"$GIT_DIR/MERGE_MSG" die "Automatic merge failed; fix up by hand" fi -- 2.26.2