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

Re: [not even design notes yet] teaching rerere to remember removal?

From
Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Date
May 19, 2023, 07:51 UTC
Message-ID
<ZGcqgR5RimHJiwFv@ugly>
In-Reply-To
<xmqq353ts2qt.fsf@gitster.g>
On Thu, May 18, 2023 at 03:18:02PM -0700, Junio C Hamano wrote:
>So I am wondering what should be used as the record of "if the other
>branch made this change, we have seen this conflict already, and we
>know it is safe to resolve it to remove the path".
>

i suppose i may be missing the obvious, but why not just treat the removal as a full diff (like a traditional patch would do) and remember the resolution accordingly like any other conflict?

the key to making this useful is presenting followup conflicts in a sensible way that highlights where they actually are, but that would be useful regardless - i often run into this while rebasing, where finding that one line that i added to a bigger section that was (re-)moved requires so much attention that i instead look at the original patch rather than the conflict to see what it was. (note that i'm using diff3 markers.)

regards, ossi

Previous: Junio C Hamano
Message 2 of 2 in “[not even design notes yet] teaching rerere to remember removal?”
  1. Junio C HamanoMay 18, 2023
  2. Oswald BuddenhagenMay 19, 2023

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.