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

Re: [RFC WIP PATCH] merge: implement -s theirs -X N

From
Stefan Beller <sbeller@google.com>
Date
Apr 18, 2018, 23:22 UTC
Message-ID
<CAGZ79kak57D2_9bx5KwefFEZ0=Dk2bbZ=n8YFnByChK=6Hj2HQ@mail.gmail.com>
In-Reply-To
<87sh7sdtc1.fsf@evledraar.gmail.com>

On Wed, Apr 18, 2018 at 3:48 PM, Ævar Arnfjörð Bjarmason <avarab@gmail.com> wrote:

> We have a -s ours, but not a -s theirs. This is a WIP patch to implement
> that. It works, but I haven't dealt with this part of the internal API
> before, comments most welcome.

I hope reference pointers are welcome, too. https://public-inbox.org/git/xmqqzi9iazrp.fsf@gitster.mtv.corp.google.com/

Previous: Ævar Arnfjörð BjarmasonNext: Junio C Hamano
Message 2 of 7 in “merge: implement -s theirs -X N”
  1. merge: implement -s theirs -X NÆvar Arnfjörð Bjarmason, Apr 18, 2018
  2. Stefan BellerApr 18, 2018
  3. Junio C HamanoApr 19, 2018
  4. Junio C HamanoApr 19, 2018
  5. Ævar Arnfjörð BjarmasonApr 19, 2018
  6. Junio C HamanoApr 20, 2018
  7. Ævar Arnfjörð BjarmasonApr 20, 2018

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.