git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
HMHans Meiser <brille1@hotmail.com>
Date
Oct 15, 2022, 16:07 UTC
Message-ID
<AS4P195MB1527956C72FD0407FF4C488EE2279@AS4P195MB1527.EURP195.PROD.OUTLOOK.COM>
In-Reply-To
<CA+JQ7M8Bcr9czyBNg-+sFpqGSy=3QJfps8vGPa=82QGAvqpUSw@mail.gmail.com>
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?
Previous: Erik Cervin EdinNext: Johannes Schindelin
Message 3 of 5 in “Cannot rebase – possible Git for Windows bug?”
  1. Hans MeiserOct 13, 2022
  2. Erik Cervin EdinOct 13, 2022
  3. Dead-end Situation created by amending a merge commit in a topic branchHans Meiser, Oct 15, 2022
  4. Johannes SchindelinOct 18, 2022
  5. Hans MeiserOct 18, 2022

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.