I frequently get asked how to resolve conflicts in git. It’s not obvious how to do it, but it is surprisingly easy to do.
Posts Tagged ‘git’
Posted in 
Tags: 
Convert VSS to Git
March 10th, 2013 
etdot I just converted my old Visual Source Safe (VSS) projects to Git repositories on my Gitolite server in minutes! I was impressed with how quick and easy the process was.