Solutions Log » git-svn http://solutions.unixsherpa.com by Dan Reiland Tue, 05 Apr 2011 16:42:14 +0000 en hourly 1 http://wordpress.org/?v=3.3.1 Git Subtree Merge and git-svnhttp://solutions.unixsherpa.com/2010/03/02/git-subtree-merge-and-git-svn/ http://solutions.unixsherpa.com/2010/03/02/git-subtree-merge-and-git-svn/#comments Tue, 02 Mar 2010 17:02:37 +0000 Dan http://solutions.unixsherpa.com/?p=262 Issue: Git submodules do not play nicely with git-svn; git subtree merging is a more appropriate strategy for my specific use case.

Resolution: This is my recipe (borrowed heavily from the formal git documentation).

git checkout -b TRY-MERGE master
git remote add -f Bproject /path/to/B
git merge -s ours --no-commit Bproject/master
git read-tree --prefix=dir-B/ -u Bproject/master
git commit -m "Task - JIRA-001 - Merge B project as our subdirectory"
git checkout master
git merge TRY-MERGE master -m "Task - JIRA-001 - Merging subtrees into project."
git-svn dcommit

You may update your local copy from the remote at any time with:

git pull -s subtree Bproject master

Reference: http://kernel.org/pub/software/scm/git/docs/v1.7.0/howto/using-merge-subtree.html

]]> http://solutions.unixsherpa.com/2010/03/02/git-subtree-merge-and-git-svn/feed/ 0