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

Why doesn't git rebase --interactive --preserve-merges continue past known conflicts?

From
David D. Kilzer <ddkilzer@kilzer.net>
Date
Dec 31, 2010, 19:30 UTC
Message-ID
<282560.39741.qm@web30004.mail.mud.yahoo.com>

When I run "git rebase --interactive --preserve-merges" on a sequence of commits, edit an earlier commit, then run "git rebase --continue", the rebase operation always stops on a merge commit with a known conflict (in the rr-cache) instead of resolving it and continuing.

As long as I'm not rearranging commits, I expect git-rebase to resolve the known merge commit conflict and continue. Why does it always stop?

I've attached a simple test case that demonstrates this behavior.
Dave
Next: David D. Kilzer
Message 1 of 2 in “Why doesn't git rebase --interactive --preserve-merges continue past known conflicts?”
  1. David D. KilzerDec 31, 2010
  2. Why doesn't git rebase --interactive --preserve-merges continue past known conflicts?David D. Kilzer, Jan 2, 2011

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.