From: Junio C Hamano <gitster@pobox.com>
To: Tay Ray Chuan <rctay89@gmail.com>
Cc: Nanako Shiraishi <nanako3@lavabit.com>,
Johannes Sixt <j.sixt@viscovery.net>,
geoffrey.russell@gmail.com, git@vger.kernel.org
Subject: Re: Merging a branch when I don't want conflicts
Date: Mon, 18 May 2009 09:17:00 -0700 [thread overview]
Message-ID: <7v8wkucrnn.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <be6fef0d0905180857y538b2c4y7208faa147a57601@mail.gmail.com> (Tay Ray Chuan's message of "Mon\, 18 May 2009 23\:57\:54 +0800")
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.
prev parent reply other threads:[~2009-05-18 16:22 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-18 2:30 Merging a branch when I don't want conflicts Geoff Russell
2009-05-18 6:18 ` Johannes Sixt
2009-05-18 8:05 ` Geoff Russell
2009-05-18 9:01 ` Johannes Sixt
2009-05-18 23:53 ` Geoff Russell
2009-05-18 10:45 ` Nanako Shiraishi
2009-05-18 15:57 ` Tay Ray Chuan
2009-05-18 16:17 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7v8wkucrnn.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=geoffrey.russell@gmail.com \
--cc=git@vger.kernel.org \
--cc=j.sixt@viscovery.net \
--cc=nanako3@lavabit.com \
--cc=rctay89@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).