Re: Show skipped commit message after rebase conflict?

From: Johannes Sixt <j6t@kdbg.org>
Date: Jul 26, 2025, 07:00 UTC
Message-ID: <553bd772-a92c-4782-a7aa-3092b3aa0494@kdbg.org>
In-Reply-To: <CAAVFnN=S-bu1FNafyyH797AeBxUu+8vk5yJ5xaxCUBkBZin_6w@mail.gmail.com>

Am 25.07.25 um 17:20 schrieb Cameron Steffen:

Show 9 quoted lines

>> But only if we can positively tell the reason why there is no change
>> relative to the parent commit _is_ because the commit we are
>> currently picking has already been applied, that is.
> 
> I thought we merely would need to see that there are no staged changes
> to be committed, and there is a currently-picking commit that will now
> be skipped? I don't need to know whether the commit was already
> applied. I just want to know that the commit in the rebase plan is not
> being committed.

How would rebase know what I did while I had control? I could have fixed the conflicts and committed manually. I could have reset to a different commit. I could have split the change into two commits. I could have removed the changes. I could have made additional changes. Possibilities are unlimited. Saying something like "commit 123abc is now empty" or "is skipped" would be incorrect most of the time in my workflow.

-- Hannes