Posts Tagged ‘git’

Merging and resolving conflicts with git

January 10th, 2014 etdot

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.

Posted in programming Tags: , Comments Off on Merging and resolving conflicts with git
Read More »

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.

Posted in Computers, programming Tags: , , , Comments Off on Convert VSS to Git
Read More »