Add 'git accept-ours' and 'git accept-theirs'
Setup git svn to remove empty dirs from the SVN