On Mon, 2 Jun 2008, Junio C Hamano wrote: > "Merge branches 'RELEASE' and 'fluff' into RELEASE"? That happens if you > are _on_ release branch and say "git merge release fluff". Right. But git shouldn't do duplicate parents. I agree it's a mis-use of git merge, but either we should have errored out or we should have pruned the parents. Yes, the end result is "tecnically correct", but it's not optimal. Linus -- 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
