"Sverre Hvammen Johansen" <hvammen@xxxxxxxxx> writes: > I have been testing octopus merges and figured it is not very smart with > respect to fast forward. Octopus is designed to be simple and stupid. Its sole purpose is to bind more than two _independent_ development tracks, and by definition if they are totally independent, like A and B and C all forked from the current tip of our HEAD, it should make a new commit that is children of A and B and C. If B and C are not independent (e.g. C is a descendant of B), you should not be using Octopus to begin with. The thing is, Octopus makes the bisection (not the internal processing of "git bisect", but the whole experience with "git bisect" which is measured by the number of commits you may have to test to find the one bad commit) less efficient, especially when the branches that are merged are not independent topics. So keep it simple, and do not use Octopus if there is no justification other than "it looks cool" you can come up with. I do not mind a patch to git-merge-octopus to discurage its use even more by detecting the casen where some of the merged branches are not independent and refusing to work, but that is a post 1.5.4 topic. - 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
