Using Git With SVN

May 11th, 2012

Here is my workflow for using Git with SVN:

//create local repo git svn init -s http://url-of-repo git svn fetch git svn rebase //work on a local branch or branches git checkout -b myfeature //make some changes and commit git commit -a -m "made some changes" //switch to master and rebase changes git checkout master git rebase myfeature git svn rebase //see differences between local and svn trunk git diff remotes/trunk //commit changes to svn git svn dcommit