I just love it how team git & team TFS managed to migrate same fuckin project several times from one source control to the other and back.. and they all root for their source control as it's the bestest of them all.. yet when presented with specific conflict situation and asked how to most elegantly resolve it I get an 'ugh, I don't know, I've never worked with anyone else on a project let alone on intertwined parts so I never had to resolve conflicts.' -.- Dude, wtf?!