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

Re: [PATCH] merge-recursive: make "CONFLICT (rename/delete)" message show both paths

From
Junio C Hamano <gitster@pobox.com>
Date
Feb 1, 2017, 23:28 UTC
Message-ID
<xmqqa8a5mqxa.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<1485991441.28767.2.camel@mattmccutchen.net>
Matt McCutchen <matt@mattmccutchen.net> writes:
Show 10 quoted lines
> On Wed, 2017-02-01 at 12:56 -0800, Junio C Hamano wrote:
>
>> Let me make sure if I understood your changes correctly:
>>  ...
>> So the condition to guard the call to update_file() also looks
>> correct to me.
>
> All of the above matches my understanding.  Would it have saved you
> time if I had included some of this explanation in the patch "cover
> letter"?

The fact that I arrived at the same understanding by reading the change without peeking at such a cheat-sheet gives me more peace of mind ;-)

Thanks.
Previous: Matt McCutchen
Message 5 of 5 in “merge-recursive: make "CONFLICT (rename/delete)" message show both paths”
  1. merge-recursive: make "CONFLICT (rename/delete)" message show both pathsMatt McCutchen, Jan 28, 2017
  2. Junio C HamanoJan 30, 2017
  3. Junio C HamanoFeb 1, 2017
  4. Matt McCutchenFeb 1, 2017
  5. Junio C HamanoFeb 1, 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.