# Cannot rebase – possible Git for Windows bug? 5 messages from 2022-10-13 to 2022-10-18. Participants: Hans Meiser, Erik Cervin Edin, Johannes Schindelin. Thread: https://gitlist.dev/t/58622 ## Hans Meiser, 2022-10-13 11:35 Subject: Cannot rebase – possible Git for Windows bug? Message-ID: URL: https://gitlist.dev/e/AS4P195MB1527C07F4E985018B6BD12C3E2259%40AS4P195MB1527.EURP195.PROD.OUTLOOK.COM In-Reply-To: ``` 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 ``` ## Erik Cervin Edin, 2022-10-13 17:03 Subject: Re: Cannot rebase – possible Git for Windows bug? Message-ID: URL: https://gitlist.dev/e/CA%2BJQ7M8Bcr9czyBNg-%2BsFpqGSy%3D3QJfps8vGPa%3D82QGAvqpUSw%40mail.gmail.com In-Reply-To: ``` On Thu, Oct 13, 2022 at 1:43 PM Hans Meiser 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. ``` ## Hans Meiser, 2022-10-15 16:07 Subject: Dead-end Situation created by amending a merge commit in a topic branch Message-ID: URL: https://gitlist.dev/e/AS4P195MB1527956C72FD0407FF4C488EE2279%40AS4P195MB1527.EURP195.PROD.OUTLOOK.COM In-Reply-To: ``` 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? ``` ## Johannes Schindelin, 2022-10-18 14:30 Subject: Re: Dead-end Situation created by amending a merge commit in a topic branch Message-ID: URL: https://gitlist.dev/e/n7599nnr-qps4-oo46-93o9-8310q0r44714%40tzk.qr In-Reply-To: ``` 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? ``` ## Hans Meiser, 2022-10-18 22:35 Subject: Re: Dead-end Situation created by amending a merge commit in a topic branch Message-ID: URL: https://gitlist.dev/e/AS4P195MB15271C837469DEDB33FB0545E2289%40AS4P195MB1527.EURP195.PROD.OUTLOOK.COM In-Reply-To: ``` 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 Sent: Tuesday, October 18, 2022 16:30 To: Hans Meiser Cc: Erik Cervin Edin ; 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 Sent: Wednesday, October 19, 2022 00:34 To: Johannes Schindelin Cc: Erik Cervin Edin ; 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 Sent: Tuesday, October 18, 2022 16:30 To: Hans Meiser Cc: Erik Cervin Edin ; 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? ```