Created
May 21, 2010 12:48
-
-
Save maxp/408781 to your computer and use it in GitHub Desktop.
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
| 1) git svn clone svn://url/ | |
| 2) git checkout -b local | |
| 3) git add/commit/add/commit/.... | |
| 4) git checkout master | |
| 5) git svn rebase | |
| 6) git checkout local | |
| 7) git merge --no-ff master | |
| 8) fix conflicts/git add/git commit -a | |
| 9) git checkout master | |
| 10) git svn rebase | |
| 11) if some updates, goto 6 | |
| 12) git merge --squash local | |
| 13) git commit -a | |
| 14) git svn dcommit | |
| 15) git branch -D local | |
| 16) git svn rebase | |
| 17) goto 2 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment