{"thread":{"id":"18866","subject":"rebaseing topic branch which has merges from master","startedAt":"2009-04-14T15:03:50Z","lastAt":"2009-04-14T15:03:50Z","messageCount":1,"participants":["Marc Mutz"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"111291","messageId":"gs28e1$ktn$1@ger.gmane.org","threadId":"18866","inReplyTo":null,"subject":"rebaseing topic branch which has merges from master","fromName":"Marc Mutz","fromEmail":"marc@kdab.net","sentAt":"2009-04-14T15:03:50Z","receivedAt":"2009-04-14T15:03:50Z","isPatch":false,"sender":{"key":"marc@kdab.net","avatar":null},"body":"Hi,\n\nI'd like to achieve the following:\n\n---(BP)--- ....---(M1)---     ...    ---(M2)---   .... master\n     \\              \\                     \\\n      \\              \\                     \\\n      (T1)---(T2)---(T3)---(T4)---(T5)---(T6)--- .... topic\n \n \n                                   ||\n                                   ||\n                                   VV\n \n \n---(BP)---....---(M1)---     ...    ---(M2)---   .... master\n                   \\                     \\_____________\n                    \\                                  \\\n                   (T1)---(T2)---(T3)---(T4)---(T5)---(T6)--- .... topic\n\nHowever, when I run\n  git checkout topic\n  git rebase M1\nI get a conflict somewhere around a merge commit down the road, and when I\ngitk to check where I am, I see master commits (M2, M2^) that have changed\ntheir (sha1) name. That shouldn't happen, afaiu git, so what's wrong? Is\nthis simply not supported? Can I flatten the merge commits somehow before\nrebasing?\n\nThanks,\nMarc\n"}]}