* rebaseing topic branch which has merges from master
@ 2009-04-14 15:03 Marc Mutz
0 siblings, 0 replies; only message in thread
From: Marc Mutz @ 2009-04-14 15:03 UTC (permalink / raw)
To: git
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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-04-14 16:02 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-04-14 15:03 rebaseing topic branch which has merges from master Marc Mutz
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.