I think I will continue to work from SVN branches, because I'm a lot more familiar with that process. I'm also going to start working on a couple of different checkouts of the c++-concepts branch independently, so this should be a little easier for me.
I can move those patches over to git and push the changes in separate branches in addition to the usual submission mechanism. Would that be appropriate? Can I create a bunch of different git branches for small feature sets? Andrew On Thu, Jun 20, 2013 at 1:33 PM, Jason Merrill <ja...@redhat.com> wrote: > 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 > -- Andrew Sutton andrew.n.sut...@gmail.com