Stash

You can't merge with local modifications. Git protects you from losing potentially important changes. You have three options. One is to commit the change using

git commit -m "My message"

The second is to stash it. stashing acts as a stack, where you can push changes, and you pop them in reverse order.

To stash type:

git stash

Do the merge, and then pull the stash:

git stash pop

The third options is to discard the local changes using

git reset --hard