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

Re: [RFC PATCH 3/9] merge-recursive: New function for better colliding conflict resolutions

From
Elijah Newren <newren@gmail.com>
Date
Nov 11, 2017, 16:49 UTC
Message-ID
<CABPp-BHhjUp3_UcO2u4sVzj0mbk_aVKWK=-KbBECLvwDhE3tvg@mail.gmail.com>
In-Reply-To
<20171110222156.23221-4-newren@gmail.com>
On Fri, Nov 10, 2017 at 2:21 PM, Elijah Newren <newren@gmail.com> wrote:
> There are three conflict types that represent two (possibly entirely
> unrelated) files colliding at the same location:
<snip>
> If the files are similar enough, the two-way merge is probably
> preferable, but if they're not similar, recording as separate files is
> probably similar.  (The same logic that applies for the working
That should read, "...recording as separate files is probably preferable".
Previous: Elijah NewrenNext: Elijah Newren
Message 4 of 12 in “Improve rename detection performance in merge recursive”
  1. 0/9 Improve rename detection performance in merge recursiveElijah Newren, Nov 10, 2017
  2. 2/9 merge-recursive: Avoid unnecessary string list lookupsElijah Newren, Nov 10, 2017
  3. 3/9 merge-recursive: New function for better colliding conflict resolutionsElijah Newren, Nov 10, 2017
  4. Elijah NewrenNov 11, 2017
  5. 4/9 Add testcases for improved file collision conflict handlingElijah Newren, Nov 10, 2017
  6. Elijah NewrenNov 11, 2017
  7. 6/9 merge-recursive: Improve handling for rename/rename(2to1) conflictsElijah Newren, Nov 10, 2017
  8. 5/9 merge-recursive: Fix rename/add conflict handlingElijah Newren, Nov 10, 2017
  9. 8/9 merge-recursive: Accelerate rename detectionElijah Newren, Nov 10, 2017
  10. 9/9 diffcore-rename: Filter rename_src list when possibleElijah Newren, Nov 10, 2017
  11. 7/9 merge-recursive: Improve handling for add/add conflictsElijah Newren, Nov 10, 2017
  12. 1/9 diffcore-rename: No point trying to find a match better than exactElijah Newren, Nov 10, 2017

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.