your local changes to the following files would be overwritten by merge code example
Example 1: error: Your local changes to the following files would be overwritten by merge:
git checkout HEAD^ file/to/overwrite
git pull
Example 2: error: Your local changes to the following files would be overwritten by checkout:
git stash save your-file-name
git checkout master
# do whatever you had to do with master
git checkout staging
git stash pop
Example 3: force files to be overwritten by merge
$ git stash --include-untracked