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

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

From
ABAndrey Butirsky <butirsky@gmail.com>
Date
Dec 27, 2021, 12:52 UTC
Message-ID
<3e1548ab-5e20-9555-bd10-d6cbf2ffbce4@gmail.com>
Hi, stumbling upon this again and again, so decided to write finally,

while in conflicting state, the only thing we can do to auto-pick one or another side of conflict is passing --ours/--theirs option to git-checkout: git checkout --ours/--theirs <path>

The problem is - it doesn't actually do a _merge_, i.e. you lose all non-conflicted changes.

There is no easy way to solve that currently without third-party tools.

This link illustrates it: https://stackoverflow.com/a/68498101/1063363

Proposal: Shell we add -X <strategy-option> to git checkout <path> to allow it do a merge and _actually solve_ merge conflicts? That would be in-pair with other commands taking the option already: git-merge, git-rebase, (etc.?)

Next: Andrey Butirsky
Message 1 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.