This occurs when issuing the git pull command.
error: Your local changes to 'path/to/file' would be overwritten by merge. Aborting. Please, commit your changes or stash them before you can merge.
The git checkout command can be used to overwrite the local copy of the file in your branch (master) with the file in the origin Git repository.
git checkout 'path/to/file'