On Sun, Jul 31, 2011 at 20:21, Michael Witten <mfwitten@xxxxxxxxx> wrote: > Why are there conflicts anyway? Oh... I guess there were conflicts when the merge commit was made in the original repository, and these conflicts were resolved by the merge commit itself. Hence, when rebase tries to split up a merge by dealing with just the non-merge parents, you end up having to deal with the conflict again. Shouldn't rebase take this into account? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html