神策开发流程

Administrator@DESKTOP-9RF9I06 MINGW64 /e/Gitlab_files/console/common (shs)
$ git checkout sensors
Switched to branch 'sensors'

切换到console/common下面的sensors分支上

Administrator@DESKTOP-9RF9I06 MINGW64 /e/Gitlab_files/console/common (sensors)
$ git pull origin sensors
From http://gitlab.innogeek.cn/miqu/common
* branch sensors -> FETCH_HEAD
Already up to date.
拉取远程的sensors分支

Administrator@DESKTOP-9RF9I06 MINGW64 /e/Gitlab_files/console/common (sensors)
$ git checkout shs
Switched to branch 'shs'
切换到shs分支下

Administrator@DESKTOP-9RF9I06 MINGW64 /e/Gitlab_files/console/common (shs)
$ git merge sensors
Already up to date.
合并sensors分支

Administrator@DESKTOP-9RF9I06 MINGW64 /e/Gitlab_files/console/common (shs)
$ git checkout sensors
Switched to branch 'sensors'
切换到sensors分支

Administrator@DESKTOP-9RF9I06 MINGW64 /e/Gitlab_files/console/common (sensors)
$ git merge shs
Updating 0944a09..18f5fd1
Fast-forward
合并shs分支

Administrator@DESKTOP-9RF9I06 MINGW64 /e/Gitlab_files/console/common (sensors)
$ git push origin sensors 推送到远程该文件夹下sensors分支下
Counting objects: 21, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (21/21), done.
Writing objects: 100% (21/21), 2.86 KiB | 731.00 KiB/s, done.
Total 21 (delta 17), reused 0 (delta 0)
remote:
remote: To create a merge request for sensors, visit:
remote: http://gitlab.innogeek.cn/miqu/common/merge_requests/new?merge_request %5Bsource_branch%5D=sensors
remote:
To http://gitlab.innogeek.cn/miqu/common.git
6f69728..18f5fd1 sensors -> sensors

 

Administrator@DESKTOP-9RF9I06 MINGW64 /e/Gitlab_files/console/common (sensors)
$ cd ../../app_api/common

切换到api/common文件夹下

Administrator@DESKTOP-9RF9I06 MINGW64 /e/Gitlab_files/app_api/common (Test/20180 522/3.2.8)
$ git branch -a
Feature-homeowners
* Test/20180522/3.2.8
common_shirley
master
sensors
shs
remotes/origin/Feature-homeowners
remotes/origin/Feature/20180511/tixianhoutai
remotes/origin/Feature/20180516/new_user_task
remotes/origin/Feature/20180521/new_roomer
remotes/origin/Features/20180517/xiaomiActivity
remotes/origin/HEAD -> origin/master
remotes/origin/Test/20180522/3.2.8
remotes/origin/chs
remotes/origin/common_shirley
remotes/origin/master
remotes/origin/sensors

Administrator@DESKTOP-9RF9I06 MINGW64 /e/Gitlab_files/app_api/common (Test/20180 522/3.2.8)
$ git checkout sensors
Switched to branch 'sensors'

切换到sensors分支下

Administrator@DESKTOP-9RF9I06 MINGW64 /e/Gitlab_files/app_api/common (sensors)
$ git pull origin sensors
From http://gitlab.innogeek.cn/miqu/common
* branch sensors -> FETCH_HEAD
Updating 909f027..18f5fd1
Fast-forward
config/const.php | 44 +++++++
dao/ShiTuDAO.php | 22 +++-
dao/sensorsanaly/SensorsAnalyticsDAO.php | 1 +
dao/sensorsanaly/SensorsAnalyticsEvent.php | 15 ++-
dao/sensorsanaly/user/UserAttentionOrCancelDAO.php | 64 ++++++++++
.../voiceroom/UserMasterApprenticeActionDAO.php | 76 +++++++++++-
.../voiceroom/UserOpenCloseVoiceRoomDAO.php | 16 +--
dao/sensorsanaly/voiceroom/UserSeatUpDownDAO.php | 51 ++++++--
dao/statistics/DayCashTopFiftyDAO.php | 125 +++++++++++++++++++
dao/statistics/NewRoomerFindDAO.php | 132 +++++++++++++++++++++
dao/statistics/PlatformRoomCashDAO.php | 84 +++++++++++++
dao/statistics/VoiceRoomDayDataDAO.php | 4 +
dao/voiceroom/VoiceRoomDAO.php | 27 +++--
13 files changed, 625 insertions(+), 36 deletions(-)
create mode 100644 config/const.php
create mode 100644 dao/sensorsanaly/user/UserAttentionOrCancelDAO.php
create mode 100644 dao/statistics/DayCashTopFiftyDAO.php
create mode 100644 dao/statistics/NewRoomerFindDAO.php
create mode 100644 dao/statistics/PlatformRoomCashDAO.php
拉取最新的sensors分支

Administrator@DESKTOP-9RF9I06 MINGW64 /e/Gitlab_files/app_api/common (sensors)
$ git branch -a
Feature-homeowners
Test/20180522/3.2.8
common_shirley
master
* sensors
shs
remotes/origin/Feature-homeowners
remotes/origin/Feature/20180511/tixianhoutai
remotes/origin/Feature/20180516/new_user_task
remotes/origin/Feature/20180521/new_roomer
remotes/origin/Features/20180517/xiaomiActivity
remotes/origin/HEAD -> origin/master
remotes/origin/Test/20180522/3.2.8
remotes/origin/chs
remotes/origin/common_shirley
remotes/origin/master
remotes/origin/sensors

Administrator@DESKTOP-9RF9I06 MINGW64 /e/Gitlab_files/app_api/common (sensors)
$ git merge shs
Already up to date.
合并shs分支

Administrator@DESKTOP-9RF9I06 MINGW64 /e/Gitlab_files/app_api/common (sensors)
$ git branch
Test/20180522/3.2.8
master
* sensors
shs