Last active
March 24, 2022 07:37
-
-
Save notmandatory/20076477a6c2b8b37b53e75d82afda03 to your computer and use it in GitHub Desktop.
Manual merge PRs to preserve commit signatures
This file contains hidden or 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
# from target repo clone directory | |
# make sure you're in sync with origin | |
git checkout master | |
git fetch --all | |
git pull upstream master | |
# fetch PR to FETCH_HEAD | |
git fetch upstream pull/<PR#>/head | |
# double check the changes | |
git diff master FETCH_HEAD | |
# merge to master and push to upstream (github) | |
git merge FETCH_HEAD | |
git push upstream |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment