Michael J Gruber venit, vidit, dixit 23.02.2011 12:18: > Note that you're merging branches which are way off, > > git rev-list --count --left-right > origin/integration/dev300_m98...stage/ooo/dev300 > 3566 3126 > > and that the merge base is quite old: > > af61642 (#i105937# Fixed a few remaining gradient glitches, 2010-01-16) Following up on this: git rev-list --count --left-right origin/integration/dev300_m98...stage/ooo/dev300 3566 3126 git rev-list --count --left-right --no-merges origin/integration/dev300_m98...stage/ooo/dev300 2794 2180 git rev-list --count --left-right --no-merges --cherry-pick origin/integration/dev300_m98...stage/ooo/dev300 1136 528 That is, 2500 of these different commits are patch-equivalent (cherry-picks). I don't think "merge" is the best tool to combine "fake" branches like those. You may be better off with rebase... Although I'm wondering what the branch policy was that lead to this. Michael -- 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