$ 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
# Your branch is ahead of 'origin/master' by 12 commits.
# (use "git push" to publish your local commits)
#
nothing to commit, working directory clean
$ git add --all
$ git commit -m "Changes on production"
# On branch master
# Your branch is ahead of 'origin/master' by 12 commits.
# (use "git push" to publish your local commits)
#
nothing to commit, working directory clean
$ git pull origin master
From ssh://bitbucket.by:7999/code/git.202.by
* 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 12 commits.
# (use "git push" to publish your local commits)
#
nothing to commit, working directory clean
$ git push origin master
To ssh://git@bitbucket.by:7999/code/git.202.by.git
a5f8013..ca64b5d master -> master
$ touch execafterdeploy.php
$ cat execafterdeploy.php
$ git fetch -p