/home/bitrix/panmarket/panmarket.by $ pwd
/home/bitrix/panmarket/panmarket.by $ git config --global user.email "git@pandveri.by"
/home/bitrix/panmarket/panmarket.by $ git config --global user.name "panmarket.by prodaction"
/home/bitrix/panmarket/panmarket.by $ git config --global --list
user.name=panmarket.by prodaction
/home/bitrix/panmarket/panmarket.by $ git config core.filemode false
/home/bitrix/panmarket/panmarket.by $ git remote add origin git@bitbucket.org:hyperpan/main_panmarket.by_v_2.git
fatal: remote origin already exists.
/home/bitrix/panmarket/panmarket.by $ git remote set-url origin git@bitbucket.org:hyperpan/main_panmarket.by_v_2.git
/home/bitrix/panmarket/panmarket.by $ git remote -v
origin git@bitbucket.org:hyperpan/main_panmarket.by_v_2.git (fetch)
origin git@bitbucket.org:hyperpan/main_panmarket.by_v_2.git (push)
/home/bitrix/panmarket/panmarket.by $ whoami
/home/bitrix/panmarket/panmarket.by $ 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/components/panmarket/catalog.element/component.php
# modified: local/cron/full_exchange/active_inactive.php
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
# local/components/webteamby/goods.update/log/log_2022-05-15.log
# local/components/webteamby/goods.update/log/log_2022-05-16.log
# local/components/webteamby/goods.update/log/log_2022-05-17.log
no changes added to commit (use "git add" and/or "git commit -a")
/home/bitrix/panmarket/panmarket.by $ git add --all
/home/bitrix/panmarket/panmarket.by $ git commit -m "Changes on production"
[master 721b07c] Changes on production
5 files changed, 1469 insertions(+), 1367 deletions(-)
create mode 100644 local/components/webteamby/goods.update/log/log_2022-05-15.log
create mode 100644 local/components/webteamby/goods.update/log/log_2022-05-16.log
create mode 100644 local/components/webteamby/goods.update/log/log_2022-05-17.log
/home/bitrix/panmarket/panmarket.by $ git pull origin master
From bitbucket.org:hyperpan/main_panmarket.by_v_2
* branch master -> FETCH_HEAD
Already up-to-date.
/home/bitrix/panmarket/panmarket.by $ git checkout --theirs .
/home/bitrix/panmarket/panmarket.by $ 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
/home/bitrix/panmarket/panmarket.by $ git push origin master
To git@bitbucket.org:hyperpan/main_panmarket.by_v_2.git
1673772..721b07c master -> master
/home/bitrix/panmarket/panmarket.by $ git submodule sync
/home/bitrix/panmarket/panmarket.by $ git submodule update
/home/bitrix/panmarket/panmarket.by $ git submodule status