git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Junio C Hamano <gitster@pobox.com>
Date
May 18, 2009, 16:17 UTC
Message-ID
<7v8wkucrnn.fsf@alter.siamese.dyndns.org>
In-Reply-To
<be6fef0d0905180857y538b2c4y7208faa147a57601@mail.gmail.com>
Tay Ray Chuan <rctay89@gmail.com> writes:
Show 8 quoted lines
> 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.
Previous: Tay Ray Chuan
Message 8 of 8 in “Merging a branch when I don't want conflicts”
  1. Geoff RussellMay 18, 2009
  2. Johannes SixtMay 18, 2009
  3. Geoff RussellMay 18, 2009
  4. Johannes SixtMay 18, 2009
  5. Geoff RussellMay 18, 2009
  6. Nanako ShiraishiMay 18, 2009
  7. Tay Ray ChuanMay 18, 2009
  8. Junio C HamanoMay 18, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.