Re: git-svn merging into branch?
From: Jean-Baptiste Quenot <hidden>
Date: 2016-06-15 22:44:26
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/