Stop cherry-picking, start merging, Part 1: The merge conflictblogs.msdn.microsoft.com11 pointsmpweiher8 years ago