From: "David D. Kilzer" <ddkilzer@kilzer.net>
To: git@vger.kernel.org
Subject: Why doesn't git rebase --interactive --preserve-merges continue past known conflicts?
Date: Fri, 31 Dec 2010 11:30:46 -0800 (PST) [thread overview]
Message-ID: <282560.39741.qm@web30004.mail.mud.yahoo.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 493 bytes --]
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
[-- Attachment #2: t3404-rebase-interactive-preserve-merges.sh --]
[-- Type: application/x-sh, Size: 736 bytes --]
next reply other threads:[~2010-12-31 19:30 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-31 19:30 David D. Kilzer [this message]
2011-01-02 1:20 ` [RFC PATCH] Why doesn't git rebase --interactive --preserve-merges continue past known conflicts? David D. Kilzer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=282560.39741.qm@web30004.mail.mud.yahoo.com \
--to=ddkilzer@kilzer.net \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.