Here's an index to the "Stop cherry-picking, start merging" series that just completed, if that's the sort of thing you are into:
- Stop cherry-picking, start merging, Part 1: The merge conflict
- Stop cherry-picking, start merging, Part 2: The merge conflict that never happened (but should have)
- Stop cherry-picking, start merging, Part 3: Avoiding problems by creating a new merge base
- Stop cherry-picking, start merging, Part 4: Exploiting the recursive merge algorithm
- Stop cherry-picking, start merging, Part 5: Exploiting the three-way merge
- Stop cherry-picking, start merging, Part 6: Replacing the temporary fix with the permanent fix
- Stop cherry-picking, start merging, Part 7: Preventing a change from leaving a branch
- Stop cherry-picking, start merging, Part 8: How to merge a partial cherry-pick
- Stop cherry-picking, start merging, Part 9: Chasing the commit
- Stop cherry-picking, start merging, Part 10: Web-based workflow for VSTS