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

Re: [PATCH 2/4] merge-recursive: increase marker length with depth of recursion

From
Elijah Newren <newren@gmail.com>
Date
Oct 16, 2018, 18:00 UTC
Message-ID
<CABPp-BGQv35K+wt2pY6ddVCiU=GL7jhqqEmAB0eWRVsaMTk8tA@mail.gmail.com>
In-Reply-To
<xmqqr2gq3aau.fsf@gitster-ct.c.googlers.com>
On Mon, Oct 15, 2018 at 7:17 PM Junio C Hamano <gitster@pobox.com> wrote:
Show 10 quoted lines
>
> Elijah Newren <newren@gmail.com> writes:
>
> > Would you like me to edit the commit message to include this more
> > difficult case?
>
> Neither.  If the "marker length" change is required in a separate
> series that will build on top of the current 4-patch series, I think
> dropping this step from the current series and make it a part of the
> series that deals with rename/rename would make more sense.

Okay, I'll resubmit this series without this patch or associated testcase, and include those in the later file collision series.

Previous: Junio C HamanoNext: Elijah Newren
Message 11 of 15 in “More merge cleanups”
  1. 0/4 More merge cleanupsElijah Newren, Oct 12, 2018
  2. 3/4 merge-recursive: improve auto-merging messages with path collisionsElijah Newren, Oct 12, 2018
  3. Junio C HamanoOct 15, 2018
  4. 4/4 merge-recursive: Avoid showing conflicts with merge branch before HEADElijah Newren, Oct 12, 2018
  5. Junio C HamanoOct 15, 2018
  6. 1/4 t6036: add testcase where virtual merge base contains nested conflictsElijah Newren, Oct 12, 2018
  7. 2/4 merge-recursive: increase marker length with depth of recursionElijah Newren, Oct 12, 2018
  8. Junio C HamanoOct 15, 2018
  9. Elijah NewrenOct 15, 2018
  10. Junio C HamanoOct 16, 2018
  11. Elijah NewrenOct 16, 2018
  12. 0/2 More merge cleanupsElijah Newren, Oct 16, 2018
  13. 1/2 merge-recursive: improve auto-merging messages with path collisionsElijah Newren, Oct 16, 2018
  14. 2/2 merge-recursive: avoid showing conflicts with merge branch before HEADElijah Newren, Oct 16, 2018
  15. Junio C HamanoOct 18, 2018

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.