[tibbon]

I just sent that to our team that is getting used to using Git/Github as opposed to msft VSS and were just asking about merging fails. :)