Re: Merging a branch when I don't want conflicts

Tay Ray Chuan [off-list ref] writes:

Hi,

On Mon, May 18, 2009 at 6:45 PM, Nanako Shiraishi [off-list ref] wrote:

quoted

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.