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

Re: fmt-merge-message: add empty line between tag and signature verification

From
Ralf Thielow <ralf.thielow@googlemail.com>
Date
May 25, 2012, 18:35 UTC
Message-ID
<CAN0XMO+LH9ZYSAtRVLOPU3p0bP4mryHkML2wi1KhNEui+AL=uA@mail.gmail.com>
In-Reply-To
<7vtxz4tcmn.fsf@alter.siamese.dyndns.org>
On Fri, May 25, 2012 at 7:05 PM, Junio C Hamano <gitster@pobox.com> wrote:
Show 7 quoted lines
>> Btw, I'd also like to see the merge notes (notably the conflict file list)
>> before the generated shortlog, but that seems to really not work with the
>> current fmt-merge-message model.  Oh well.
>
> Postponing to assess if such a change is feasible, I am not sure if that
> ordering makes more sense than the current one.  Is the objective to more
> strongly motivate people to explain what happened to the conflicts?

IMHO it only makes sense when you have a short list of conflicted files. I mostly work on Java projects and when we merge a branch this list can be very long. This is caused by several tools, different IDEs, different OSes and so on and so forth. Anyway... What I want to see on a merge like this is the shortlog. I only become interested in the conflicts if there is an issue in the software caused by a conflict resolution. Just my experience on Java projects I'm working on.

Previous: Martin Fick
Message 5 of 5 in “fmt-merge-message: add empty line between tag and signature verification”
  1. Linus TorvaldsMay 25, 2012
  2. Junio C HamanoMay 25, 2012
  3. Linus TorvaldsMay 25, 2012
  4. Martin FickMay 25, 2012
  5. Ralf ThielowMay 25, 2012

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.