Skip to content

Instantly share code, notes, and snippets.

@ignu
Created August 4, 2009 13:26
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save ignu/161229 to your computer and use it in GitHub Desktop.
Save ignu/161229 to your computer and use it in GitHub Desktop.
git svn clone svn://svn-url --trunk=trunk --branches=branches --tags=tag
git checkout -b TrunkLocal trunk
git checkout -b LiveLocal live
[from Live Branch]
git merge TrunkLocal --no-ff
# git svn actually ties to remote branches via the commit history, so if you get the url to the trunk in your live branch, you'll commit to it... --no-ff prevents that
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment