Корзина пуста
Корзина
0
Корзина пуста
Каталог продукции
назад

GIT DEPLOYMENT SCRIPT

$ pwd
/var/www/user-skladtepla/data/www/sklad-tepla.ru
$ git config user.email "git@sklad-tepla.ru"
$ git config user.name "sklad-tepla.ru server"
$ git config --list
core.repositoryformatversion=0
core.filemode=false
core.bare=false
core.logallrefupdates=true
remote.origin.url=git@bitbucket.org:vasbkadg/git.sklad-tepla.ru.git
remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
user.email=git@sklad-tepla.ru
user.name=sklad-tepla.ru server
$ git config core.filemode false
$ whoami
user-skladtepla
$ 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/templates/.default/components/bitrix/catalog.section/tiles/component_epilog.php
modified: local/templates/gradtepla/components/bitrix/catalog.element/tabs_units/result_modifier.php
modified: local/templates/gradtepla/components/webprofy/catalog/.default/section.php

no changes added to commit (use "git add" and/or "git commit -a")
$ git add --all
$ git commit -m "Changes on production"
[master 865691a] Changes on production
3 files changed, 6 insertions(+), 4 deletions(-)
$ git pull origin master
From bitbucket.org:vasbkadg/git.sklad-tepla.ru
* branch master -> FETCH_HEAD
Already up to date.
$ git checkout --theirs .
$ git commit -am "Remote Conflict"
On branch master
nothing to commit, working tree clean
$ git push origin master
To bitbucket.org:vasbkadg/git.sklad-tepla.ru.git
f406a21..865691a master -> master
$ git submodule sync
$ git submodule update
$ git submodule status
$ touch execafterdeploy.php
$ cat execafterdeploy.php
Корзина пуста