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

From: Jakub Narebski <[email-masked]>
Date: Sat, 31 Mar 2007 14:06:58 +0200

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