From: Jarrad Whitaker <jarrad.whitaker@gmail.com>
To: Chris Torek <chris.torek@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Feature request - optionally include merge conflicts in `git add -p`
Date: Sat, 31 May 2025 15:51:18 +1000 [thread overview]
Message-ID: <CAOWMAxwqQepzcGpuocLA+d2=+AAdLYDOswsNr3w8xaO9zZFqqQ@mail.gmail.com> (raw)
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
prev parent reply other threads:[~2025-05-31 5:51 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-27 23:54 Feature request - optionally include merge conflicts in `git add -p` Jarrad Whitaker
2025-05-28 0:56 ` Chris Torek
2025-05-31 5:51 ` Jarrad Whitaker [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAOWMAxwqQepzcGpuocLA+d2=+AAdLYDOswsNr3w8xaO9zZFqqQ@mail.gmail.com' \
--to=jarrad.whitaker@gmail.com \
--cc=chris.torek@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).