Please commit your changes or stash them before you when i run git merge upstream/master code example

Example 1: error: Your local changes to '.gitignore' would be overwritten by merge. Aborting. Please, commit your changes or stash them before you can merge.

git status
git stash
git status

Example 2: git stash changes before merge

git stash pop