git-svn merging into branch?

3 messages, 2 authors, 2016-06-15 · open the first message on its own page

git-svn merging into branch?

From: Joe Fiorini <hidden>
Date: 2016-06-15 22:44:26

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

Re: git-svn merging into branch?

From: Joe Fiorini <hidden>
Date: 2016-06-15 22:44:26

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

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/
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help