On 06/20/2013 01:23 PM, Jason Merrill wrote:
Since Gaby prefers SVN, let's keep using the SVN branch; it really isn't much less convenient than a git-only branch. The main difference is 'git svn rebase'/'git svn dcommit' instead of 'git pull'/'git push'.
The one caveat is that git-svn historically hasn't handled merges very well. I think git-svn v1.8.3 or newer can do the right thing, but I haven't tested it, so it's probably best to keep doing merges with the svn client for the time being.
Jason
