At some point I had to manually fix an issue in a submodule and overwrite two files manually.
But now the next time I want to push the lastest commit to production I get this error. How to fix it? How to pull the latest commit in the submodule github.com:xxx/submodule in production?
root@test:/var/www/test.dk# git push production
Enumerating objects: 33, done.
Counting objects: 100% (33/33), done.
Compressing objects: 100% (17/17), done.
Writing objects: 100% (18/18), 3.79 KiB | 971.00 KiB/s, done.
Total 18 (delta 11), reused 0 (delta 0), pack-reused 0
remote: Already on 'master'
remote: From github.com:xxx/submodule
remote: 40608f1..08243d5 master -> origin/master
remote: error: Your local changes to the following files would be overwritten by checkout:
remote: request/Input.php
remote: stream/Headers.php
remote: Please commit your changes or stash them before you switch branches.
remote: Aborting
