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

Re: [PATCH 0/3] detecting delete/modechange conflicts

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 26, 2015, 21:46 UTC
Message-ID
<xmqq8u6pfgl9.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<20151026213502.GA17244@sigill.intra.peff.net>
Jeff King <peff@peff.net> writes:
Show 5 quoted lines
> After looking through the history and the list archive, I don't _think_
> this was intentional, and we simply missed the case in both places. But
> maybe somebody else knows something I don't. It seems like we should be
> punting to the user under the general principle of stupid and safe
> merges.

Yes, I do not recall ever discussing and agreeing with Linus that we should resolve to deletion over mode change, and I agree that it would be very likely that this never came up in practice simply because in real life removal is already rare, mode change is rarer, and these happening to the same path in the same timeperiod to matter in merges is even more rare.

We should definitely signal a conflict.
Show 5 quoted lines
>   [1/3]: t6031: move triple-rename test to t3030
>   [2/3]: t6031: generalize for recursive and resolve strategies
>   [3/3]: merge: detect delete/modechange conflict
>
> -Peff
Previous: Jeff KingNext: Jeff King
Message 5 of 6 in “detecting delete/modechange conflicts”
  1. 0/3 detecting delete/modechange conflictsJeff King, Oct 26, 2015
  2. 1/3 t6031: move triple-rename test to t3030Jeff King, Oct 26, 2015
  3. 2/3 t6031: generalize for recursive and resolve strategiesJeff King, Oct 26, 2015
  4. 3/3 merge: detect delete/modechange conflictJeff King, Oct 26, 2015
  5. Junio C HamanoOct 26, 2015
  6. Jeff KingOct 26, 2015

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.