$ git config --global user.email "git_prod@bagi66.ru "
$ git config --global user.name "git_bagi66_prod"
$ git config --global --list
user.email=git_prod@bagi66.ru
user.name=git_bagi66_prod
$ git config core.filemode false
$ 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: sites/bagi66.ru/include/top_page/search.title.catalog.php
# modified: sites/bagi66.ru/include/top_page/search.title.mobile.php
#
no changes added to commit (use "git add" and/or "git commit -a")
$ git add --all
$ git commit -m "Changes on production"
[master 3bc31c3] Changes on production
2 files changed, 2 insertions(+), 2 deletions(-)
$ git pull origin master
From gitlab.com:bagi66/bagi66_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 1 commit.
# (use "git push" to publish your local commits)
#
nothing to commit, working directory clean
$ git push origin master
To git@gitlab.com:bagi66/bagi66_new.git
fbe969a..3bc31c3 master -> master
$ git fetch -p