I ran git pull origin master
and I get the following message because I have my changes in a single file. What command should I issue so that the changes are overwritten on my local copies.
- branch master -> FETCH_HEAD Updating 7sc4344..c81c437 error: Your local changes to 'foo.txt' would be overwritten by merge. Aborting. Please, commit your changes or stash them before you can merge.