Re: Dead-end Situation created by amending a merge commit in a topic branch
- From
- Hans Meiser <brille1@hotmail.com>
- Date
- Oct 18, 2022, 22:35 UTC
- Message-ID
- <AS4P195MB15271C837469DEDB33FB0545E2289@AS4P195MB1527.EURP195.PROD.OUTLOOK.COM>
- In-Reply-To
- <AS4P195MB152726A49510B13043F1DAFEE2289@AS4P195MB1527.EURP195.PROD.OUTLOOK.COM>
Hello, Johannes,
that's in fact exactly what the Stack Overflow issue does.
I wouldn't want to end up with two distinct lines of discussion on the same purpose. The Stack Overflow line should be sufficient and convenient for everyone. It's succinct yet comprehensive.
Just wanted to put your awareness to an issue in git. It's up to you to make the best of it.
Best regards, Axel
From: Johannes Schindelin <Johannes.Schindelin@gmx.de> Sent: Tuesday, October 18, 2022 16:30 To: Hans Meiser <brille1@hotmail.com> Cc: Erik Cervin Edin <erik@cervined.in>; git@vger.kernel.org <git@vger.kernel.org> Subject: Re: Dead-end Situation created by amending a merge commit in a topic branch Hi Hans,
On Sat, 15 Oct 2022, Hans Meiser wrote:
> It looks like it's possible to reach an unresolvable dead-end situation by amending a merge commit. > > For a use-case see this issue at Stack Overflow: > https://stackoverflow.com/questions/74032523/how-can-i-rebase-this-git-branch-on-master/74064773
Please note that readers such as myself make a habit of not following links thrown into a mail on the Git mailing list.
If you can summarize the problem succinctly and comprehensively, please do so, without sending readers to read through threads elsewhere and weeding out the relevant information for themselves. It's a better use of everybody's time if _one_ person distills the information into a well-written bug report, instead of forcing every reader to do that.
Ciao, Johannes
> > Is this situation desired? > > Shouldn't git rather emit an error message when trying to amend a merge commit?
From: Hans Meiser <brille1@hotmail.com> Sent: Wednesday, October 19, 2022 00:34 To: Johannes Schindelin <Johannes.Schindelin@gmx.de> Cc: Erik Cervin Edin <erik@cervined.in>; git@vger.kernel.org <git@vger.kernel.org> Subject: Re: Dead-end Situation created by amending a merge commit in a topic branch Hello, Johannes,
that's in fact exactly what the Stack Overflow issue does.
I wouldn't want to end up with two distinct lines of discussion on the same purpose. The Stack Overflow line should be sufficient for everyone. It's succinct yet comprehensive.
Just wanted to put your awareness to an issue in git. It's up to you to make the best of it.
Best regards, Axel
From: Johannes Schindelin <Johannes.Schindelin@gmx.de> Sent: Tuesday, October 18, 2022 16:30 To: Hans Meiser <brille1@hotmail.com> Cc: Erik Cervin Edin <erik@cervined.in>; git@vger.kernel.org <git@vger.kernel.org> Subject: Re: Dead-end Situation created by amending a merge commit in a topic branch Hi Hans,
On Sat, 15 Oct 2022, Hans Meiser wrote:
> It looks like it's possible to reach an unresolvable dead-end situation by amending a merge commit. > > For a use-case see this issue at Stack Overflow: > https://stackoverflow.com/questions/74032523/how-can-i-rebase-this-git-branch-on-master/74064773
Please note that readers such as myself make a habit of not following links thrown into a mail on the Git mailing list.
If you can summarize the problem succinctly and comprehensively, please do so, without sending readers to read through threads elsewhere and weeding out the relevant information for themselves. It's a better use of everybody's time if _one_ person distills the information into a well-written bug report, instead of forcing every reader to do that.
Ciao, Johannes
> > Is this situation desired? > > Shouldn't git rather emit an error message when trying to amend a merge commit?