Created
January 22, 2014 01:32
-
-
Save manhg/8551997 to your computer and use it in GitHub Desktop.
Git SVN Workflow
This file contains 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
# Reference: http://andy.delcambre.com/2008/03/04/git-svn-workflow.html | |
# Init | |
git svn init http://svn/path | |
git svn fetch | |
# make the repository smaller, but also with many many fewer files | |
git repack -d | |
# Work on feature/bug/issue | |
git checkout -b new_feature | |
# checkout the master repo, then merge back with the new feature. | |
git checkout master | |
git merge new_feature | |
# Commit | |
git commit -a -m "commit message" | |
# resync the master branch to the svn repo to make sure you don’t commit conflicts | |
git svn rebase | |
# push the commit to subversion. | |
git svn dcommit |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment