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