$ echo $PWD
/home/bitrix/www
$ whoami
bitrix
$ git add --all

$ git commit -m "Changes on production"
# On branch master
nothing to commit (working directory clean)
$ git pull origin master
From bitbucket.org:newsite/git.nerohome.by
 * branch            master     -> FETCH_HEAD
Already up-to-date.
$ git checkout --theirs .

$ git commit -am "Remote conflict"
# On branch master
nothing to commit (working directory clean)
$ git push origin master
Everything up-to-date