From: suvayu ali Date: Sun, 11 Mar 2012 10:10:19 GMT Subject: Re: Trouble with file specific merge strategies Message-ID: In-Reply-To: <7vk42rzfab.fsf@alter.siamese.dyndns.org> Hi Junio, On Sun, Mar 11, 2012 at 09:57, Junio C Hamano wrote: > suvayu ali writes: > >> ... So when I came across >> the possibility of using .gitattributes for file specific merge >> strategies, I tried the following: >> >> pattern merge=ours > > I do not think we say .gitattributes can give merge strategy > anywhere in our document. > > You can choose one of the few built-in merge drivers but "ours" is > not one of them.  Have you defined your own merge driver "ours" > following the example in the gitattributes documentation (look for > "feel-free merge driver")? Ah, that explains it. You are absolutely correct in saying that the docs don't imply this. I was having doubts about this while reading the docs (man gitattributes). I got confused by this[1] example on progit and several pointers to it on stackoverflow. And no, I don't have a custom merge driver. This brings up the question, is that discussion on progit talking about something else? Is there a way to setup file specific merge strategies in a repo? Thanks a lot for your response. :) Cheers, Footnotes: [1] http://progit.org/book/ch7-2.html#merge_strategies -- Suvayu Open source is the future. It sets us free.