git pull upstream master # upstream set to https://github.com/amix/vimrc
git mergetool --gui path # to resolve conflicts
git co --thiers path # to take theirs
git add path # to take theirs
git rm -r path # for files they removed
Last active
August 23, 2021 15:04
-
-
Save khatchad/850d8051427fe7c8c4e1829b6be8f1ad to your computer and use it in GitHub Desktop.
Pull vim config file changes from https://github.com/amix/vimrc.git to https://github.com/khatchad/vimrc.git
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment