fYour local changes to the following files would be overwritten by merge: code example

Example: 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