Created
March 8, 2021 03:53
-
-
Save slowbrewedmacchiato/1842762c7434d17c6eec63d0171b645e to your computer and use it in GitHub Desktop.
HowTo: Git Dry Merge
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 merge --no-commit --no-ff $BRANCH | |
$ git pull $REMOTE $BRANCH | |
# uh oh, that wasn't right | |
$ git reset --hard ORIG_HEAD | |
# all is right with the world | |
#see diff between current master and remote branch | |
$ git diff master origin/master |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment