$ pwd
/home/belincas/public_html
$ git config --global user.email "git@belincasgroup.by"
$ git config --global user.name "belincas server"
$ git config --global --list
user.email=git@belincasgroup.by
user.name=belincas server
$ git config core.filemode false
$ whoami
belincas
$ 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/assets/build/bundle-styles.1f84fd589d5198777320.js
# modified: local/assets/build/bundle-styles.3250f5e38d3c9d82d340.js
# modified: local/include/footer.php
#
no changes added to commit (use "git add" and/or "git commit -a")
$ git add --all
$ git commit -m "Changes on production"
[master 96ba9cf] Changes on production
3 files changed, 3 insertions(+), 2 deletions(-)
rewrite local/assets/build/bundle-styles.1f84fd589d5198777320.js (77%)
rewrite local/assets/build/bundle-styles.3250f5e38d3c9d82d340.js (78%)
$ git pull origin master
From bitbucket.org:newsite/git.belinkas
* 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/git.belinkas.git
47c9f5b..96ba9cf master -> master
$ git submodule sync
$ git submodule update
$ git submodule status
$ touch execafterdeploy.php
$ cat execafterdeploy.php