The Old New Thing
Practical development throughout the evolution of Windows.
Latest posts
Mar 22, 2018
Post comments count
0
Post likes count
0
Stop cherry-picking, start merging, Part 9: Chasing the commit
Catch the train.
Mar 21, 2018
Post comments count
0
Post likes count
0
Stop cherry-picking, start merging, Part 8: How to merge a partial cherry-pick
Pick what you want.
Mar 20, 2018
Post comments count
0
Post likes count
0
Stop cherry-picking, start merging, Part 7: Preventing a change from leaving a branch
More advanced merge base tricks.
Mar 19, 2018
Post comments count
0
Post likes count
0
Stop cherry-picking, start merging, Part 6: Replacing the temporary fix with the permanent fix
Advanced merge base tricks.
Mar 16, 2018
Post comments count
0
Post likes count
0
Stop cherry-picking, start merging, Part 5: Exploiting the three-way merge
Making sure you have the correct merge base.
Mar 15, 2018
Post comments count
0
Post likes count
1
Stop cherry-picking, start merging, Part 4: Exploiting the recursive merge algorithm
Recursive merging for fun and profit.
Mar 14, 2018
Post comments count
0
Post likes count
5
Stop cherry-picking, start merging, Part 3: Avoiding problems by creating a new merge base
Move the cherry-pick into the merge base so that git knows it exists in both sides.
Mar 13, 2018
Post comments count
0
Post likes count
1
Stop cherry-picking, start merging, Part 2: The merge conflict that never happened (but should have)
You wish you got a merge conflict, but you didn't.
Mar 12, 2018
Post comments count
0
Post likes count
7
Stop cherry-picking, start merging, Part 1: The merge conflict
Setting the pieces into motion.