How to re-merge paths differently?

From: Sergey Organov <sorganov@gmail.com>
Date: Oct 27, 2017, 15:44 UTC
Message-ID: <87wp3g61ez.fsf@javad.com>

Hello,

Is there anything like this:

$ git merge b [... lot of conflicts ...] $ git re-merge -X ours -- x/ # Leaves 0 conflicts in x/ $ git re-merge -X theirs -- y/ # Leaves 0 conflicts in y/ [... resolve the rest of conflicts manually ...] $ git commit

[*] I do mean '-X' above, not '-s'.

-- Sergey

$ 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.