Your local changes to the following files would be overwritten by merge: config/application.php 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