Switch from SVN to Git
Merging branches