From: Tay Ray Chuan <rctay89@gmail.com>
Date: Mon, 18 May 2009 15:57:54 GMT
Subject: Re: Merging a branch when I don't want conflicts
Message-ID: <be6fef0d0905180857y538b2c4y7208faa147a57601@mail.gmail.com>
In-Reply-To: <20090518194548.6117@nanako3.lavabit.com>

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

-- 
Cheers,
Ray Chuan