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