Posts Tagged ‘git’

Merging and resolving conflicts with git

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.

Convert VSS to Git

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.