Re: Show skipped commit message after rebase conflict?
- From
Cameron Steffen <cam.steffen94@gmail.com>
- Date
- Jul 26, 2025, 02:40 UTC
- Message-ID
- <CAAVFnNmqGwGEddSv9CbWQGx_pyhY4aGMWj5fKN+7TQo6N6CyYQ@mail.gmail.com>
- In-Reply-To
- <xmqq5xff3jhc.fsf@gitster.g>
I see what you mean now. I guess I did not consider the meaning of that message very closely.
On Fri, Jul 25, 2025 at 7:04 PM Junio C Hamano <gitster@pobox.com> wrote:
Show 20 quoted lines
> > Cameron Steffen <cam.steffen94@gmail.com> writes: > > >> 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. > > Then your earlier idea to reuse the same message > > >> warning: skipped previously applied commit <hash> > > > > Potentially we could use the very same message. > > would not work, would it?