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

Re: request: allow passing -X <strategy-option> to git checkout <path> to auto-solve merge conflicts

From
EEErik Cervin Edin <erik@cervined.in>
Date
Dec 29, 2021, 14:51 UTC
Message-ID
<CA+JQ7M9ANzeiZC7uLPoe671hT8wGDyO7tWu7+YxfDB0QE6YR5Q@mail.gmail.com>
In-Reply-To
<fffeed2f-c956-d34f-ea5f-73f52e2d2be4@gmail.com>
On Wed, Dec 29, 2021 at 2:35 PM Andrey Butirsky <butirsky@gmail.com> wrote:
>
> This is exactly what I tried to avoid, since Git already seem has all
> the needed under the hood to prevent such disaster..

It'd be neat if you could specify -X ours/theirs/both But I'm not sure I would describe the current situation as disastrous

Previous: Andrey Butirsky
Message 6 of 6 in “request: allow passing -X <strategy-option> to git checkout <path> to auto-solve merge conflicts”
  1. Andrey ButirskyDec 27, 2021
  2. Andrey ButirskyDec 28, 2021
  3. Erik Cervin EdinDec 28, 2021
  4. Erik Cervin EdinDec 29, 2021
  5. Andrey ButirskyDec 29, 2021
  6. Erik Cervin EdinDec 29, 2021

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.