From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 11 Mar 2012 08:57:00 GMT
Subject: Re: Trouble with file specific merge strategies
Message-ID: <7vk42rzfab.fsf@alter.siamese.dyndns.org>
In-Reply-To: <CAMXnza3SLHWLsFkYLhkJLAwtP2n=QVTXZ__GSL-CvajxC6i0Dw@mail.gmail.com>

suvayu ali <fatkasuvayu+linux@gmail.com> 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")?