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

Re: Request for adding a "clean" merge strategy for a double-commit merge to deal with conflicts separately

From
Junio C Hamano <gitster@pobox.com>
Date
Jul 21, 2020, 20:43 UTC
Message-ID
<xmqqlfjc7g58.fsf@gitster.c.googlers.com>
In-Reply-To
<CABPp-BE2R3eUU7WD1Ovkn_OfVH6fc42DnXs5CuBTkMUcQsnCdQ@mail.gmail.com>
Elijah Newren <newren@gmail.com> writes:
> I disagree that they are "lost".  Rather, git doesn't make them very
> easy to access: git log -p won't show you any output for a merge by
> default, and the only options that exist (-c, -cc) don't do what you
> need to see how conflicts were resolved.

With "sometimes" sprinkled into appropriate places, you are 110% right.

Previous: Elijah Newren
Message 8 of 8 in “Request for adding a "clean" merge strategy for a double-commit merge to deal with conflicts separately”
  1. AlirezaJul 16, 2020
  2. Michal SuchánekJul 16, 2020
  3. Junio C HamanoJul 16, 2020
  4. AlirezaJul 21, 2020
  5. Elijah NewrenJul 21, 2020
  6. AlirezaJul 21, 2020
  7. Elijah NewrenJul 21, 2020
  8. Junio C HamanoJul 21, 2020

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.