From: Marc Mutz <marc@kdab.net>
To: git@vger.kernel.org
Subject: rebaseing topic branch which has merges from master
Date: Tue, 14 Apr 2009 17:03:50 +0200 [thread overview]
Message-ID: <gs28e1$ktn$1@ger.gmane.org> (raw)
Hi,
I'd like to achieve the following:
---(BP)--- ....---(M1)--- ... ---(M2)--- .... master
\ \ \
\ \ \
(T1)---(T2)---(T3)---(T4)---(T5)---(T6)--- .... topic
||
||
VV
---(BP)---....---(M1)--- ... ---(M2)--- .... master
\ \_____________
\ \
(T1)---(T2)---(T3)---(T4)---(T5)---(T6)--- .... topic
However, when I run
git checkout topic
git rebase M1
I get a conflict somewhere around a merge commit down the road, and when I
gitk to check where I am, I see master commits (M2, M2^) that have changed
their (sha1) name. That shouldn't happen, afaiu git, so what's wrong? Is
this simply not supported? Can I flatten the merge commits somehow before
rebasing?
Thanks,
Marc
reply other threads:[~2009-04-14 16:02 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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='gs28e1$ktn$1@ger.gmane.org' \
--to=marc@kdab.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.