Stop cherry-picking, start merging
The article argues that cherry-picking individual commits between branches leads to merge conflicts and duplicated work, recommending instead to use regular merging (or rebasing) to keep branches in sync more cleanly and maintain a coherent history.
Background
Raymond Chen writes the long-running "The Old New Thing" blog at Microsoft, explaining Windows internals and development practices. This post argues that developers should merge feature branches into the main line as complete units, rather than cherry-picking individual commits across branches.