{"thread":{"id":"12892","subject":"git-svn merging into branch?","startedAt":"2008-03-27T17:30:14Z","lastAt":"2008-03-28T08:34:33Z","messageCount":3,"participants":["Joe Fiorini","Jean-Baptiste Quenot"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"73210","messageId":"AF82B803-0999-4C9F-95EE-184E829F2569@faithfulgeek.org","threadId":"12892","inReplyTo":null,"subject":"git-svn merging into branch?","fromName":"Joe Fiorini","fromEmail":"joe@faithfulgeek.org","sentAt":"2008-03-27T17:30:14Z","receivedAt":"2008-03-27T17:30:14Z","isPatch":false,"sender":{"key":"joe@faithfulgeek.org","avatar":null},"body":"My company uses Subversion for their SCM.  I'd like to start using git  \non my dev box to eventually show how useful it is.  We're working on a  \nnew deploy process that involves merging changes into an svn branch.   \nI have a feeling this will be accomplished much more easily with Git,  \nhowever I also know our team will not take kindly to switching SCM  \nproducts at the moment.  I couldn't find this in the documentation,  \nbut is is possible to use git-svn to merge changes from a git  \nrepository into a particular Subversion branch?\n\nThanks all!\nJoe Fiorini\nhttp://www.faithfulgeek.org // agile web development\n"},{"id":"73243","messageId":"B3FD53D6-CB70-4D21-ACE2-7B9D4B19F675@faithfulgeek.org","threadId":"12892","inReplyTo":"AF82B803-0999-4C9F-95EE-184E829F2569@faithfulgeek.org","subject":"Re: git-svn merging into branch?","fromName":"Joe Fiorini","fromEmail":"joe@faithfulgeek.org","sentAt":"2008-03-28T06:32:45Z","receivedAt":"2008-03-28T06:32:45Z","isPatch":false,"sender":{"key":"joe@faithfulgeek.org","avatar":null},"body":"I'll take that as a no? :-)\n\n-Joe\n\nOn Mar 27, 2008, at 1:30 PM, Joe Fiorini wrote:\n\n> My company uses Subversion for their SCM.  I'd like to start using  \n> git on my dev box to eventually show how useful it is.  We're  \n> working on a new deploy process that involves merging changes into  \n> an svn branch.  I have a feeling this will be accomplished much more  \n> easily with Git, however I also know our team will not take kindly  \n> to switching SCM products at the moment.  I couldn't find this in  \n> the documentation, but is is possible to use git-svn to merge  \n> changes from a git repository into a particular Subversion branch?\n>\n> Thanks all!\n> Joe Fiorini\n> http://www.faithfulgeek.org // agile web development\n> --\n> To unsubscribe from this list: send the line \"unsubscribe git\" in\n> the body of a message to majordomo@vger.kernel.org\n> More majordomo info at  http://vger.kernel.org/majordomo-info.html\n"},{"id":"73245","messageId":"ae63f8b50803280134v1d24854dwacd21a1ef95951ed@mail.gmail.com","threadId":"12892","inReplyTo":"B3FD53D6-CB70-4D21-ACE2-7B9D4B19F675@faithfulgeek.org","subject":"Re: git-svn merging into branch?","fromName":"Jean-Baptiste Quenot","fromEmail":"jbq@caraldi.com","sentAt":"2008-03-28T08:34:33Z","receivedAt":"2008-03-28T08:34:33Z","isPatch":false,"sender":{"key":"jbq@caraldi.com","avatar":null},"body":"You can either use SVN-specific tools, namely svn merge or svnmerge,\nor GIT-specific tools, namely git merge, git rebase or git cherry\npick.  If you choose the latter, once done you can simply git-svn\ndcommit your changes.\n\nCheers,\n-- \nJean-Baptiste Quenot\nhttp://caraldi.com/jbq/blog/\n"}]}