Last active
April 10, 2019 00:54
-
-
Save jayers99/2a13a9d362a20ba54dd5a497c6a606f5 to your computer and use it in GitHub Desktop.
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
| # reset my local to my origin | |
| git fetch --all | |
| git reset --hard origin/<branch> | |
| # auto rebase conflicts | |
| git rebase -X ours upstream/master |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment