error: Your local changes to the following files would be overwritten by merge: configuration/models.py iso/settings_local.py Please commit your changes or stash them before you merge. Aborting 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