Force Git to Overwrite files
Some users some times change a file, and can not do a git pull command, usually they get this error:
... Please, commit your changes or stash them before you can merge. Aborting
the solution is to force to overwrite your files, you can do this command.
git fetch --all && git reset --hard origin/master