error: Your local changes to the following files would be overwritten by merge: .gitignore Please commit your changes or stash them before you merge. code example
Example: git stash changes before merge
git stash pop
git stash pop