From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 18 May 2009 16:17:00 GMT
Subject: Re: Merging a branch when I don't want conflicts
Message-ID: <7v8wkucrnn.fsf@alter.siamese.dyndns.org>
In-Reply-To: <be6fef0d0905180857y538b2c4y7208faa147a57601@mail.gmail.com>

Tay Ray Chuan <rctay89@gmail.com> writes:

> Hi,
>
> On Mon, May 18, 2009 at 6:45 PM, Nanako Shiraishi <nanako3@lavabit.com> wrote:
>> I think -Xours enhancement that was developed long time ago
>
> I think this is now called -s ours/--strategy=ours:
>
> http://www.kernel.org/pub/software/scm/git/docs/git-merge.html

Read it again.  -Xours is very different from -s ours.