+375 29 123-00-70 +375 29 233-00-70
kingstyle@kingstyle.by

можно по Skype: kingstyle.by

$ pwd
/home/bitrix/www
$ git config --global user.email "info@kingstyle.by"
$ git config --global user.name "kingstyle server"
$ git config --global --list
user.name=kingstyle server
user.email=info@kingstyle.by
$ git config core.filemode false
$ whoami
bitrix
$ git status
# On branch master
nothing to commit, working directory clean
$ 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.kingstyle.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
$ git submodule sync
$ git submodule update
$ git submodule status
$ touch execafterdeploy.php
$ cat execafterdeploy.php