From: Jarrad Whitaker <jarrad.whitaker@gmail.com>
Date: Sat, 31 May 2025 05:51:18 GMT
Subject: Re: Feature request - optionally include merge conflicts in `git add -p`
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