Skip to content

Instantly share code, notes, and snippets.

@nuclearglow

nuclearglow/gist:b902df6c1158c5dd6aef451b392e2651

Last active April 15, 2020 13:23
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save nuclearglow/b902df6c1158c5dd6aef451b392e2651 to your computer and use it in GitHub Desktop.
Save nuclearglow/b902df6c1158c5dd6aef451b392e2651 to your computer and use it in GitHub Desktop.
Download ZIP
git: update branch from forked repo
Raw
gistfile2.txt
gco master
git pull git@github.com: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