-
-
Save jimeh/283705 to your computer and use it in GitHub Desktop.
Git SVN Workflow
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# >> 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