Last active
May 26, 2020 22:05
-
-
Save luiarthur/e9a63a41a94e4523b0a2ce0ff2230763 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
# Go to master branch (if needed) | |
git checkout master | |
# Look around | |
git remote -v | |
# Add upstream repo of the fork (if needed) | |
git remote add upstream <ssh-or-https-url-to-original-repo> | |
# Look around again | |
git remote -v | |
# Get latest version of repo | |
git fetch upstream | |
# Merge original repo into forked repo (locally) | |
git merge upstream/master | |
# Merge master to dev-branch | |
git checkout <my-dev-branch> | |
git merge master |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment