"Pull while keeping your changes intact"
git pull -s recursive -X ours
"Reset the working tree to the last commit"
git reset --hard HEAD
Last active
June 8, 2018 05:27
-
-
Save tudorelu/f6bc9f114c4bed424b0ebf5b36e54461 to your computer and use it in GitHub Desktop.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment