Stop cherry-picking, start merging
https://blogs.msdn.microsoft.com/oldnewthing/20180312-00/?p=98215 [blogs.msdn.microsoft.com]
2018-03-28 23:11
Cherry-picking is a common operation in git, and it’s not a good idea. Sometimes it’s a neutral idea, but I haven’t yet found a case where it’s actually good.
Part 2: https://blogs.msdn.microsoft.com/oldnewthing/20180313-00/?p=98225
But you know what’s worse than a merge conflict?
No merge conflict.
Part 3: https://blogs.msdn.microsoft.com/oldnewthing/20180314-00/?p=98235
Part 4: https://blogs.msdn.microsoft.com/oldnewthing/20180315-00/?p=98245
Part 5: https://blogs.msdn.microsoft.com/oldnewthing/20180316-00/?p=98255
Part 6: https://blogs.msdn.microsoft.com/oldnewthing/20180319-00/?p=98265
Part 7: https://blogs.msdn.microsoft.com/oldnewthing/20180320-00/?p=98275
Part 8: https://blogs.msdn.microsoft.com/oldnewthing/20180321-00/?p=98285
Part 9: https://blogs.msdn.microsoft.com/oldnewthing/20180322-00/?p=98295
Part 10: https://blogs.msdn.microsoft.com/oldnewthing/20180323-00/?p=98315
Index: https://blogs.msdn.microsoft.com/oldnewthing/20180323-01/?p=98325