$ 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 4 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 4 commits.
# (use "git push" to publish your local commits)
#
nothing to commit, working directory clean
$ 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 4 commits.
# (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
4d518ca..2e28faf master -> master
$ touch execafterdeploy.php
$ cat execafterdeploy.php
$ git fetch -p