git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Git merge commit message issue

From
Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date
Jul 6, 2015, 16:08 UTC
Message-ID
<vpqtwths1yq.fsf@anie.imag.fr>
In-Reply-To
<loom.20150706T173729-880@post.gmane.org>
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/
Previous: Andrey HsiaoNext: Andrey Hsiao
Message 2 of 4 in “Git merge commit message issue”
  1. Andrey HsiaoJul 6, 2015
  2. Matthieu MoyJul 6, 2015
  3. Andrey HsiaoJul 6, 2015
  4. Matthieu MoyJul 6, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.