Git development
 help / color / mirror / Atom feed
From: Phillip Wood <phillip.wood123@gmail.com>
To: Patrick Steinhardt <ps@pks.im>, git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, Elijah Newren <newren@gmail.com>
Subject: Re: [PATCH REGRESSION] builtin/rebase: allow user to amend committed conflicts again
Date: Wed, 23 Sep 2026 15:22:32 +0100	[thread overview]
Message-ID: <24cc4bcc-1d26-46f5-a502-ba673713f4f0@gmail.com> (raw)
In-Reply-To: <c12d2ac3-5263-4301-aa64-a311a343dd40@gmail.com>

On 23/09/2026 15:02, Phillip Wood wrote:
> On 23/09/2026 14:16, Patrick Steinhardt wrote:
>> Instead, use the existence of "MERGE_MSG" to figure out whether the user
>> has already resolved and committed the conflict. It feels somewhat fishy
>> to base our decisions on the existence of that particular file, as it
>> really is only a proxy for what we are actually after. 
> 
> I think that's probably the best we can do. If, after committing a 
> conflict resolution from "git rebase", the user runs a merge/cherry- 
> pick/revert that has conflicts, then "MERGE_MSG" will also exist, but we 
> don't want them to amend that case either so it should be fine.
> 
> The code changes look good,

Let me rephrase that. The code changes look good for "git rebase", but 
do we have a similar problem with "cherry-pick", "merge" and "revert"?

Thanks

Phillip

  reply	other threads:[~2026-09-23 14:22 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-09-23 13:16 [PATCH REGRESSION] builtin/rebase: allow user to amend committed conflicts again Patrick Steinhardt
2026-09-23 14:02 ` Phillip Wood
2026-09-23 14:22   ` Phillip Wood [this message]
2026-09-23 17:33     ` Junio C Hamano
2026-09-23 17:49       ` Elijah Newren
2026-09-24  6:10         ` Johannes Sixt
2026-09-27  8:04           ` Jiang Xin
2026-09-23 17:48 ` Elijah Newren
2026-09-23 17:59   ` Junio C Hamano
2026-09-23 18:23   ` Patrick Steinhardt
2026-09-23 18:33     ` Junio C Hamano
2026-09-23 18:38       ` Patrick Steinhardt
2026-09-23 19:11       ` Elijah Newren

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=24cc4bcc-1d26-46f5-a502-ba673713f4f0@gmail.com \
    --to=phillip.wood123@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=newren@gmail.com \
    --cc=phillip.wood@dunelm.org.uk \
    --cc=ps@pks.im \
    /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