please commit or stash them before you merge code example
Example: 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
git status
git stash
git status