Created
May 29, 2019 05:37
-
-
Save jsamuel1/342989fab99088af1e094cfabd62e25c to your computer and use it in GitHub Desktop.
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 checkout -b upstream | |
| git remote add upstream git@github.com/upstream1/blah.git | |
| git fetch upstream # or use -f in git remote add | |
| git merge -s subtree upstream/master --allow-unrelated-histories -X theirs |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment