Your local changes to the following files would be overwritten by merge Please commit your changes or stash them before you merge code example

git checkout HEAD^ file/to/overwrite
git pull