Stop cherry-picking, start merging: Index
Raymond Chen
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:
- Part 1: The merge conflict
- Part 2: The merge conflict that never happened (but should have)
- Part 3: Avoiding problems by creating a new merge base
- Part 4: Exploiting the recursive merge algorithm
- Part 5: Exploiting the three-way merge
- Part 6: Replacing the temporary fix with the permanent fix
- Part 7: Preventing a change from leaving a branch
- Part 8: How to merge a partial cherry-pick
- Part 9: Chasing the commit
- Part 10: Web-based workflow for VSTS
- Stop merging if you need to cherry-pick: A response from the VSTS team.
Light
Dark
0 comments