Git merge commit message issue

Dear list: In the past, when we do the merge in git, if conflicts occurred, when we commit, the conflict list will be appended to the default commit message automatically. eg: Conflicts: a.java b.java Today, after using Git 2.3.0 for a merge, it seems now the conflict list was commented

Git merge commit message issue

Dear list: In the past, when we do the merge in git, if conflicts occurred, when we commit, the conflict list will be appended to the default commit message automatically. eg: Conflicts: a.java b.java Today, after using Git 2.3.0 for a merge, it seems now the conflict list was comment

Re: Git merge commit message issue

It was a bit sad since we use scripts to do the merge, then we can check the conflict list in the log message, and assign to separate owners to resolve them. Would it be possible to make it as an config option? On Tue, Jul 7, 2015 at 12:08 AM, Matthieu Moy wrote: > Andrey Hsiao wri

Question about git log --merge option

Dear list: Just encountered the --merge option for git log. In the man page, it has the following explanation: - After a failed merge, show refs that touch files having a conflict and don't exist on all heads to merge. I tried this option and get below results: 1. For a failed merge (with confl

Re: Question about git log --merge option

Thanks Junio, I understand the option's meaning now :) On Thu, Apr 14, 2016 at 4:37 AM, Junio C Hamano wrote: > Andrey Hsiao writes: > >> Dear list: >> >> Just encountered the --merge option for git log. >> >> In the man page, it has the following exp