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

Re: Feature request - optionally include merge conflicts in `git add -p`

From
JWJarrad Whitaker <jarrad.whitaker@gmail.com>
Date
May 31, 2025, 05:51 UTC
Message-ID
<CAOWMAxwqQepzcGpuocLA+d2=+AAdLYDOswsNr3w8xaO9zZFqqQ@mail.gmail.com>
In-Reply-To
<CAPx1GvdqVpmw2mjbSDyVqBii4y=_DpTpa3jXM4_1tg5h5BWF4w@mail.gmail.com>

As a thought experiment, what would happen if the first invoked stage operation of `add -p` nuked the stage-1/2/3 versions? Would this work? The file would be recorded as no longer conflicting, is that too footgunny?

Apologies for the double-send and top-posting, Chris; I responded from my phone's gmail without thinking.

Jarrad
Previous: Chris Torek
Message 3 of 3 in “Feature request - optionally include merge conflicts in `git add -p`”
  1. Jarrad WhitakerMay 27, 2025
  2. Chris TorekMay 28, 2025
  3. Jarrad WhitakerMay 31, 2025

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.