From: Junio C Hamano Date: Wed, 18 Apr 2007 20:13:54 GMT Subject: Re: [PATCH 0/2] Custom low-level merge driver support. Message-ID: <7vk5w9fnjx.fsf@assigned-by-dhcp.cox.net> In-Reply-To: Linus Torvalds writes: > by making attributes say something like > > *: merge=ours > > because I think the attributes are really about what we do WHEN we hit > file-level conflicts, while the "merge strategy" is a much higher-level > thing. They are independent. Yes, but in the case I had trouble with, I know what I want to see happen when we DO hit file-level conflict on RelNotes symlink. The ancestor says Documentation/RelNotes-1.5.0.txt, the maint branch says Documentation/RelNotes-1.5.0.1.txt, while the current branch says Documentation/RelNotes-1.5.1.txt. The logic in merge_file() simply says "we would punt on file-level conflicts for symlinks" without giving a chance for low-level drivers to interfere.