Re: [PATCH] Keep rename/rename conflicts of intermediate merges while doing recursive merge

From: Jakub Narebski <jnareb@gmail.com>
Date: Mar 31, 2007, 12:06 UTC
Message-ID: <eulimv$369$1@sea.gmane.org>
In-Reply-To: <20070331114938.GB4377@steel.home>

Alex Riesen wrote:

> The result seem to be at least predictable. Still, doesn't it mean
> that once a rename/rename conflict is in it has to be resolved
> manually forever?

What about git-rerere2 idea (recording resolving of tree-level conflicts, i.e. rename/rename and such)?

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git

$ 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.