Cannot rebase – possible Git for Windows bug?

Cannot rebase – possible Git for Windows bug?

[Hans Meiser]

Hi,

I'm not able to rebase my branch "axel" onto "master". Whenever I do, it's just like I performed a "git reset master --hard", although my branch contains loads of changes to the code.

Here's the full description of the issue at Stack Overflow:

https://stackoverflow.com/questions/74032523/how-can-i-rebase-this-git-branch-on-master

Perhaps this is a bug in git version 2.38.0.windows.1?

Your answer is appreciated
Axel

Re: Cannot rebase – possible Git for Windows bug?

[Erik Cervin Edin]

On Thu, Oct 13, 2022 at 1:43 PM Hans Meiser <brille1@hotmail.com> wrote:
>
> Perhaps this is a bug in git version 2.38.0.windows.1?

I've rebased a lot in this version with no issue. I'd say it's highly unlikely.

Without more information it's hard to advise on what went wrong.

Dead-end Situation created by amending a merge commit in a topic branch

[Hans Meiser]

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

Is this situation desired?

Shouldn't git rather emit an error message when trying to amend a merge commit?

Re: Dead-end Situation created by amending a merge commit in a topic branch

[Johannes Schindelin]

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?

Re: Dead-end Situation created by amending a merge commit in a topic branch

[Hans Meiser]

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?