The mystery of the stalker dental hygienist March 22, 2018 Mar 22, 2018 03/22/18 Raymond Chen Haven't I seen you before?
Stop cherry-picking, start merging, Part 9: Chasing the commit March 22, 2018 Mar 22, 2018 03/22/18 Raymond Chen Catch the train.
Stop cherry-picking, start merging, Part 8: How to merge a partial cherry-pick March 21, 2018 Mar 21, 2018 03/21/18 Raymond Chen Pick what you want.
Stop cherry-picking, start merging, Part 7: Preventing a change from leaving a branch March 20, 2018 Mar 20, 2018 03/20/18 Raymond Chen More advanced merge base tricks.
Stop cherry-picking, start merging, Part 6: Replacing the temporary fix with the permanent fix March 19, 2018 Mar 19, 2018 03/19/18 Raymond Chen Advanced merge base tricks.
Stop cherry-picking, start merging, Part 5: Exploiting the three-way merge March 16, 2018 Mar 16, 2018 03/16/18 Raymond Chen Making sure you have the correct merge base.
Stop cherry-picking, start merging, Part 4: Exploiting the recursive merge algorithm March 15, 2018 Mar 15, 2018 03/15/18 Raymond Chen Recursive merging for fun and profit.
Stop cherry-picking, start merging, Part 3: Avoiding problems by creating a new merge base March 14, 2018 Mar 14, 2018 03/14/18 Raymond Chen Move the cherry-pick into the merge base so that git knows it exists in both sides.
Stop cherry-picking, start merging, Part 2: The merge conflict that never happened (but should have) March 13, 2018 Mar 13, 2018 03/13/18 Raymond Chen You wish you got a merge conflict, but you didn't.
Stop cherry-picking, start merging, Part 1: The merge conflict March 12, 2018 Mar 12, 2018 03/12/18 Raymond Chen Setting the pieces into motion.