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 16, 2020, 17:31 UTC
Message-ID
<xmqqo8ofgycz.fsf@gitster.c.googlers.com>
In-Reply-To
<CAD9n_qh0y84HC6sX1OxXWWv8dDMMA_tPv9zRknePVivQq_rfww@mail.gmail.com>
Alireza <rezaxm@gmail.com> writes:
> The proposal is that an option like `-X clean` would commit a clean
> merge and leave out any conflicting hunks in the tree for a follow-up
> commit to resolve conflicts.

You need to clarify what "leave out" means to you. If you and a side branch started from the same place and you did one thing while the side branch did something else, you would get a conflict.

What would the "clean" (by your definition) result have in that block of contents that actually has a conflict? Do you mean to say "Pick our version and ignore theirs in the blocks where the changes conflict"? If so perhaps -Xours merge strategy option that the recursive backend offers is what you are looking for?

Previous: Michal SuchánekNext: Alireza
Message 3 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.