You could change it to git commit . to add and commit everything. But just in case you weren't up to date, you should probably do

git commit .

git pull -s ours

git push

For maximum chaos.