From: Jean-Baptiste Quenot <jbq@caraldi.com>
Date: Fri, 28 Mar 2008 08:34:33 GMT
Subject: Re: git-svn merging into branch?
Message-ID: <ae63f8b50803280134v1d24854dwacd21a1ef95951ed@mail.gmail.com>
In-Reply-To: <B3FD53D6-CB70-4D21-ACE2-7B9D4B19F675@faithfulgeek.org>

You can either use SVN-specific tools, namely svn merge or svnmerge,
or GIT-specific tools, namely git merge, git rebase or git cherry
pick.  If you choose the latter, once done you can simply git-svn
dcommit your changes.

Cheers,
-- 
Jean-Baptiste Quenot
http://caraldi.com/jbq/blog/