$ pwd
/home/bitrix/www
$ git config --global user.email "git@wdl-optika.by"
$ git config --global user.name "wdl-optika.by"
$ git config --global --list
user.email=git@wdl-optika.by
user.name=wdl-optika.by
$ git config core.filemode false
$ whoami
user.name=wdl-optika.by
bitrix
$ git status
# On branch master
nothing to commit, working directory clean
$ git add --all
$ git commit -m "Changes on production"
nothing to commit, working directory clean
# On branch master
nothing to commit, working directory clean
$ git pull origin master
nothing to commit, working directory clean
From bitbucket.org:webteam_by/wdl-optika.by
* branch master -> FETCH_HEAD
Already up-to-date.
$ git checkout --theirs .
$ git commit -am "Remote Conflict"
* branch master -> FETCH_HEAD
Already up-to-date.
# On branch master
nothing to commit, working directory clean
$ git push origin master
nothing to commit, working directory clean
Everything up-to-date
$ git submodule sync
$ git submodule update
$ git submodule status
