He's just lucky his team used CVS, and not CMVC... :S

I swear I used to have a flowchart I'd blindly follow, and god help me if there was a conflict record :/