Created
March 4, 2012 19:27
-
Star
(152)
You must be signed in to star a gist -
Fork
(24)
You must be signed in to fork a gist
-
-
Save glennblock/1974465 to your computer and use it in GitHub Desktop.
Force your forked repo to be the same as upstream.
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 fetch upstream | |
| git reset --hard upstream/master |
can we do this from the GitHub UI?
How can I force users to pull from upstream after a major upgrade of the source code. I have PR validation in place (Jenkins) and they are using the old validation code (python).. ?
Works perfectly. Thanks for the tip.
you may need to also push tags
git push --tags
other variations:
git reset --hard upstream/master
git reset --hard upstream/main
git reset --hard upstream/development
👍
complete git commands would be like this:
git remote add upstream https://github.com/some_user/some_repo git fetch upstream git checkout master git reset --hard upstream/master git push origin master --force
Perfect! Thank you!
So this works great locally, but how can I get my GitHub repo master branch to be the same as locally/upstream??
This is possible with a one-liner that doesn't require downloading anything...
For anyone interested in syncing your GitHub-hosted fork directly (without cloning locally first) you can do this using the GitHub CLI:
gh repo sync owner/cli-fork -b BRANCH-NAME
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
what if there are new files in my commit that I want to keep, but changes the upstream made to files that I already have that I also want. When I try to merge upstream, I receive an error: files would be overwritten by merge. But I want them to be overwritten.