Created
October 27, 2011 14:47
-
-
Save mrjabba/1319747 to your computer and use it in GitHub Desktop.
Git branching with multiple defects when you can't commit back to SVN
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
-- Working on multiple defects when can't dcommit back to SVN for a few dayes. | |
from updated master | |
git checkout master...new defecta branch | |
do work/local commit | |
rebase master to stay current | |
git checkout master...new defectb branch | |
merge defect a branch to defectb branch | |
do work/local commit | |
rebase master to stay current | |
git checkout master...new defectc branch | |
merge defectb branch to defectc branch | |
do work/local commit | |
rebase master to stay current | |
checkout master | |
git svn rebase | |
git merge defectc branch | |
git svn dcommit |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment