From: suvayu ali <fatkasuvayu+linux@gmail.com>
Date: Sun, 11 Mar 2012 11:27:55 GMT
Subject: Re: Trouble with file specific merge strategies
Message-ID: <CAMXnza2KeDB+=59jduBWc9_6xD0qaOXSx2psX0pYDY+LwqTX0w@mail.gmail.com>
In-Reply-To: <7vd38jxu5b.fsf@alter.siamese.dyndns.org>

Hi Junio,

On Sun, Mar 11, 2012 at 12:18, Junio C Hamano <gitster@pobox.com> wrote:
> suvayu ali <fatkasuvayu+linux@gmail.com> writes:
>
>> ... is that discussion on progit talking about
>> something else?
>
> Sorry, I do not read or write progit, so I do not know offhand what
> it says in the section you read and I cannot judge if it was you who
> misread, or if it was book that misspoke.
>

Okay, thanks. I'll switch back to the tried and tested,

$ git merge -s ours

I'll take up the progit issue on the relevant discussion boards.

-- 
Suvayu

Open source is the future. It sets us free.