$ 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
# 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: aktsii/alcon.php
#
no changes added to commit (use "git add" and/or "git commit -a")
$ git add --all
# 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: aktsii/alcon.php
#
no changes added to commit (use "git add" and/or "git commit -a")
warning: LF will be replaced by CRLF in aktsii/alcon.php.
The file will have its original line endings in your working directory.
$ git commit -m "Changes on production"
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in aktsii/alcon.php.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in aktsii/alcon.php.
The file will have its original line endings in your working directory.
[master 75b8d98] Changes on production
1 file changed, 8 insertions(+), 14 deletions(-)
$ git pull origin master
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in aktsii/alcon.php.
The file will have its original line endings in your working directory.
[master 75b8d98] Changes on production
1 file changed, 8 insertions(+), 14 deletions(-)
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
# 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
# Your branch is ahead of 'origin/master' by 1 commit.
# (use "git push" to publish your local commits)
#
nothing to commit, working directory clean
To git@bitbucket.org:webteam_by/wdl-optika.by.git
f9c1b55..75b8d98 master -> master
$ git submodule sync
$ git submodule update
$ git submodule status
f9c1b55..75b8d98 master -> master
