threads / discuss / 39784

Git merge commit message issue

Subject: Git merge commit message issue

## tl;dr

4 messages between Jul 6, 2015 and Jul 6, 2015.

replies: 3people: 2as markdown or json

Andrey Hsiao· Jul 6, 2015, 15:41 UTC · lore
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 out by default.

I just searched a bit in the release notes, don't know whether below item has to do with this change.

---- "git interpret-trailers" learned to properly handle the "Conflicts:" block at the end. ----

We quite rely on the default generated conflict list to reminder us about the "history".

Is this the default behavior now (conflict list commented out)?

Thanks Best Regards

Matthieu Moy· Jul 6, 2015, 16:08 UTC · re: Andrey Hsiao · lore

Re: Git merge commit message issue

Andrey Hsiao <andreyhsiao@gmail.com> writes:
Show 13 quoted lines
> 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 out by default.
Yes, this changed here:
https://github.com/git/git/commit/261f315bebfa9af2d09f20211960100ff06f87cb
-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/
Andrey Hsiao· Jul 6, 2015, 16:16 UTC · re: Matthieu Moy · lore

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 <Matthieu.Moy@grenoble-inp.fr> wrote:

Show 23 quoted lines
> Andrey Hsiao <andreyhsiao@gmail.com> writes:
>
>> 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 out by default.
>
> Yes, this changed here:
>
> https://github.com/git/git/commit/261f315bebfa9af2d09f20211960100ff06f87cb
>
> --
> Matthieu Moy
> http://www-verimag.imag.fr/~moy/
Matthieu Moy· Jul 6, 2015, 16:33 UTC · re: Andrey Hsiao · lore

Re: Git merge commit message issue

[ Please, don't top-post on this list ]
Andrey Hsiao <andreyhsiao@gmail.com> writes:
Show 5 quoted lines
> 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?

If a script is doing the merge, then I guess you can let your script add the entry in .git/MERGE_MSG (based on something like 'git ls-files -u' or 'git status --porcelain | grep ^U'). This way, your script would work with any version of Git.

Having a config option to restore the old behavior would make sense to me at least. I guess it falls in the category "patches welcome".

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/

← back to recent threads