# git-svn merging into branch? 3 messages from 2008-03-27 to 2008-03-28. Participants: Joe Fiorini, Jean-Baptiste Quenot. Thread: https://gitlist.dev/t/12892 ## Joe Fiorini, 2008-03-27 17:30 Subject: git-svn merging into branch? Message-ID: URL: https://gitlist.dev/e/AF82B803-0999-4C9F-95EE-184E829F2569%40faithfulgeek.org ``` My company uses Subversion for their SCM. I'd like to start using git on my dev box to eventually show how useful it is. We're working on a new deploy process that involves merging changes into an svn branch. I have a feeling this will be accomplished much more easily with Git, however I also know our team will not take kindly to switching SCM products at the moment. I couldn't find this in the documentation, but is is possible to use git-svn to merge changes from a git repository into a particular Subversion branch? Thanks all! Joe Fiorini http://www.faithfulgeek.org // agile web development ``` ## Joe Fiorini, 2008-03-28 06:32 Subject: Re: git-svn merging into branch? Message-ID: URL: https://gitlist.dev/e/B3FD53D6-CB70-4D21-ACE2-7B9D4B19F675%40faithfulgeek.org In-Reply-To: ``` I'll take that as a no? :-) -Joe On Mar 27, 2008, at 1:30 PM, Joe Fiorini wrote: > My company uses Subversion for their SCM. I'd like to start using > git on my dev box to eventually show how useful it is. We're > working on a new deploy process that involves merging changes into > an svn branch. I have a feeling this will be accomplished much more > easily with Git, however I also know our team will not take kindly > to switching SCM products at the moment. I couldn't find this in > the documentation, but is is possible to use git-svn to merge > changes from a git repository into a particular Subversion branch? > > Thanks all! > Joe Fiorini > http://www.faithfulgeek.org // agile web development > -- > To unsubscribe from this list: send the line "unsubscribe git" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html ``` ## Jean-Baptiste Quenot, 2008-03-28 08:34 Subject: Re: git-svn merging into branch? Message-ID: URL: https://gitlist.dev/e/ae63f8b50803280134v1d24854dwacd21a1ef95951ed%40mail.gmail.com In-Reply-To: ``` 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/ ```