$ pwd

/home/bitrix/siteProject

$ git config --global user.email "bitrix@site.by "

$ git config --global user.name "git_newsite"

$ git config --global --list

user.email=bitrix@site.by
user.name=git_newsite
core.filemode=false

$ git config --global core.filemode false

$ git status

# On branch master
# Changes not staged for commit:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
# modified: local/classes/CExchange/import/CLoaderDeliveryAddresses.php
#
no changes added to commit (use "git add" and/or "git commit -a")

$ git add --all

$ git commit -m "Changes on production"

[master b060aaf] Changes on production
1 file changed, 2 insertions(+), 2 deletions(-)

$ git pull origin master

From bitbucket.org:newsite/202-new
* branch master -> FETCH_HEAD
Already up-to-date.

$ git checkout --theirs .

$ git commit -am "Remote Conflict"

# On branch master
# Your branch is ahead of 'origin/master' by 1 commit.
# (use "git push" to publish your local commits)
#
nothing to commit, working directory clean

$ git push origin master

To git@bitbucket.org:newsite/202-new.git
49059cf..b060aaf master -> master

$ touch execafterdeploy.php

$ cat execafterdeploy.php

$ git fetch -p