Skip to content

Instantly share code, notes, and snippets.

@anildigital
Created July 26, 2009 07:23
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 1 You must be signed in to fork a gist
  • Save anildigital/155455 to your computer and use it in GitHub Desktop.
Save anildigital/155455 to your computer and use it in GitHub Desktop.
# >> First workflow
git svn clone <svn_repo>
git checkout -b featureZ
# hack hack hack
git commit -a
git svn rebase
git svn dcommit # you can add -e to enter new
# commit message for SVN
# ---------------------------
# >> Second workflow (more ideal)
git svn clone <svn_repo>
git checkout -b featureZ
# hack hack hack
git commit -a
git checkout master
git merge featureZ # alternatively you an do git merge --squash featureZ
# to make all commits made into a single SVN commit
git svn dcommit # you can add -e to enter new
# commit message for SVN
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment