Last active
April 15, 2020 13:23
-
-
Save nuclearglow/b902df6c1158c5dd6aef451b392e2651 to your computer and use it in GitHub Desktop.
git: update branch from forked repo
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
gco master | |
git pull [email protected]:getgauge/taiko.git master | |
gco branch | |
gm master | |
# resolve conflicts | |
ga . | |
gcm "merged with master" | |
gp | |
@see here too: https://help.github.com/en/enterprise/2.13/user/articles/merging-an-upstream-repository-into-your-fork |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment