On Tue, Oct 26, 2010 at 10:39:41AM -0700, Linus Torvalds wrote: > But even that kind of "both non-merged and pre-merged" pull requests > should be reserved just for cases where there really was a somewhat > involved conflict. For trivial conflicts like a feature removal doc > clash, don't even bother. I do several trivial merges a day, it's > normal and it doesn't really take me any appreciable extra time. Git > command line of the day: > > git log --oneline v2.6.36.. --merges --author=Torvalds --grep=onflict > > to see at least a partial list of the trivial conflicts I've done in > just this merge window. It's 3-4 per day, it's perfectly normal. Makes sense, thanks! --b. -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
