Created
December 12, 2011 18:12
-
-
Save iamcal/1468403 to your computer and use it in GitHub Desktop.
Merging to a parent repo after it accepts your changes
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
$ git remote add parent git://github.com/shiflett/testmore.git | |
$ git fetch parent | |
$ git branch parent-master parent/master | |
$ git checkout parent-master | |
$ git checkout master | |
$ git merge parent-master | |
$ git push origin master | |
$ git branch -d parent-master |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment