You’ve got some local changes in your git repo. What to do?
1. you want to keep your changes
a. and track them
git add <local-changes>; git commit -m "<your message>"
b. but don’t want to track them
Note: if you’re doing a
git update-index --assume-unchanged <file>
will still result in
error: Your local changes to the following files would be overwritten by merge
--skip-worktree which didn’t work so just moved my
.gitignore file (which was causing the problem) out of the way.
2. you don’t want your changes
git co <local-changes>