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

Show skipped commit message after rebase conflict?

From
Cameron Steffen <cam.steffen94@gmail.com>
Date
Jul 24, 2025, 14:43 UTC
Message-ID
<CAAVFnNkdgXuUk6ziu5FkB=sAHzEOyiynQpQJFox_p_ZL9VGRfg@mail.gmail.com>
Hello Git Community!

Sometimes I run into a conflict in a rebase and I end up resolving the conflict by removing all the changes. Then when I run `git rebase --continue`, the current commit is skipped and the rebase continues normally. Would it be possible to emit a message showing that the commit was skipped in this case? It isn't very obvious to me in my workflow that that is what occurred.

Thanks, Cameron Steffen

Next: Junio C Hamano
Message 1 of 11 in “Show skipped commit message after rebase conflict?”
  1. Cameron SteffenJul 24, 2025
  2. Junio C HamanoJul 24, 2025
  3. Phillip WoodJul 25, 2025
  4. Cameron SteffenJul 25, 2025
  5. Junio C HamanoJul 25, 2025
  6. Cameron SteffenJul 25, 2025
  7. Junio C HamanoJul 26, 2025
  8. Cameron SteffenJul 26, 2025
  9. Johannes SixtJul 26, 2025
  10. Cameron SteffenJul 26, 2025
  11. Junio C HamanoJul 25, 2025

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.