git pull

error: Your local changes to the following files would be overwritten by merge:

config/actions.yml config/deploy.rb views/dispatch.erb

Please, commit your changes or stash them before you can merge.