Git merge commit message issue

Git merge commit message issue

[Andrey Hsiao]

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

Git merge commit message issue

[Andrey Hsiao]

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

Re: Git merge commit message issue

[Matthieu Moy]

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/

Re: Git merge commit message issue

[Andrey Hsiao]

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:
> 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/

Re: Git merge commit message issue

[Matthieu Moy]

[ Please, don't top-post on this list ]

Andrey Hsiao <andreyhsiao@gmail.com> writes:

> 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/