$ pwd
/var/www/www-root/data/www/neyiron.ru
$ git config --global user.email "git@neyron.ru
$ git config --global user.name "git_netyron"
$ git config --global --list
user.name=git_netyron
$ git config core.filemode false
$ whoami
www-root
$ git status
On branch master
Your branch is up to date with 'origin/master'.
nothing to commit, working tree clean
$ git add --all
$ git commit -m "Changes on production"
Your branch is up to date with 'origin/master'.
nothing to commit, working tree clean
On branch master
Your branch is up to date with 'origin/master'.
nothing to commit, working tree clean
$ git pull origin master
Your branch is up to date with 'origin/master'.
nothing to commit, working tree clean
From bitbucket.org:neyiron/git.neyron_new
* branch master -> FETCH_HEAD
d858f75..3beed61 master -> origin/master
Updating d858f75..3beed61
Fast-forward
local/include/reviews.php | 12 ++++++++++++
local/templates/neyron/img/reviews/protk.jpg | Bin 0 -> 256310 bytes
local/templates/neyron/img/reviews/tt-group.jpg | Bin 0 -> 261637 bytes
3 files changed, 12 insertions(+)
create mode 100644 local/templates/neyron/img/reviews/protk.jpg
create mode 100644 local/templates/neyron/img/reviews/tt-group.jpg
$ git checkout --theirs .
* branch master -> FETCH_HEAD
d858f75..3beed61 master -> origin/master
Updating d858f75..3beed61
Fast-forward
local/include/reviews.php | 12 ++++++++++++
local/templates/neyron/img/reviews/protk.jpg | Bin 0 -> 256310 bytes
local/templates/neyron/img/reviews/tt-group.jpg | Bin 0 -> 261637 bytes
3 files changed, 12 insertions(+)
create mode 100644 local/templates/neyron/img/reviews/protk.jpg
create mode 100644 local/templates/neyron/img/reviews/tt-group.jpg
Updated 0 paths from the index
$ git commit -am "Remote Conflict"
On branch master
Your branch is up to date with 'origin/master'.
nothing to commit, working tree clean
$ git push origin master
Your branch is up to date with 'origin/master'.
nothing to commit, working tree clean
Everything up-to-date
$ git submodule sync
$ git submodule update
$ git submodule status
$ touch execafterdeploy.php
touch: cannot touch 'execafterdeploy.php': Permission denied
$ cat execafterdeploy.php
