I've tried both
git update-index --assume-unchanged config/myconfig
and
editing .git/info/exclude and adding config/myconfig
however when I do git pull I always get:
Updating 0156abc..1cfd6a5 error: Your local changes to the following files would be overwritten by merge: config/myconfig Please, commit your changes or stash them before you can merge. Aborting
What am I missing?
4 Answers
git pull wants you to either remove or save your current work so that the merge it triggers doesn't cause conflicts with your uncommitted work. Note that you should only need to remove/save untracked files if the changes you're pulling create files in the same locations as your local uncommitted files.
Remove your uncommitted changes
Tracked files
git checkout -f
Untracked files
git clean -fd
