▒▒ع▒▒ MINGW64 /e/leo/real/pc-app-store-h5-react (local)
$ git checkout dev
Switched to branch 'dev'
M src/layouts/Layout.js
M src/pages/Recommend/Recommend.js
M src/pages/Uninstall/Uninstall.js
M src/pages/Uninstall/Uninstall.module.less
M src/pages/Update/Update.js
M src/pages/Update/Update.module.less
Your branch is up to date with 'origin/dev'.
毓@▒▒ع▒▒ MINGW64 /e/leo/real/pc-app-store-h5-react (dev)
$ git branch
* dev
local
master
毓@▒▒ع▒▒ MINGW64 /e/leo/real/pc-app-store-h5-react (dev)
$ git fetch origin dev
remote: Counting objects: 34, done.
remote: Compressing objects: 100% (34/34), done.
remote: Total 34 (delta 22), reused 0 (delta 0)
Unpacking objects: 100% (34/34), done.
From 10.109.5.54:zhangxf26/pc-app-store-h5-react
* branch dev -> FETCH_HEAD
38f78fd..2c7c56e dev -> origin/dev
毓@▒▒ع▒▒ MINGW64 /e/leo/real/pc-app-store-h5-react (dev)
$ git merge FETCH_HEAD
Updating 38f78fd..2c7c56e
Fast-forward
.gitlab-ci.yml | 2 +-
src/actions/native.js | 11 ++++++-
src/actions/post.js | 8 -----
src/actions/user.js | 7 ----
src/constants/native.js | 3 ++
src/constants/post.js | 3 --
src/constants/user.js | 3 --
src/index.css | 1 +
src/index.js | 15 ---------
src/layouts/Search.js | 3 ++
src/nativeapi/index.js | 3 +-
src/nativeapi/locals.js | 88 +++++++++++++++++++++++++++++++++++++++++++++++++
src/nativeapi/utils.js | 18 ----------
src/reducers/native.js | 15 ++++++---
src/reducers/post.js | 38 ---------------------
src/reducers/user.js | 38 ---------------------
src/sagas/index.js | 5 +--
src/sagas/native.js | 26 ++++++++++++---
src/sagas/post.js | 23 -------------
src/sagas/search.js | 1 -
src/sagas/user.js | 23 -------------
src/utils/utils.js | 73 +++++++++++-----------------------------
22 files changed, 161 insertions(+), 246 deletions(-)
delete mode 100644 src/actions/post.js
delete mode 100644 src/actions/user.js
delete mode 100644 src/constants/post.js
delete mode 100644 src/constants/user.js
create mode 100644 src/nativeapi/locals.js
delete mode 100644 src/reducers/post.js
delete mode 100644 src/reducers/user.js
delete mode 100644 src/sagas/post.js
delete mode 100644 src/sagas/user.js
毓@▒▒ع▒▒ MINGW64 /e/leo/real/pc-app-store-h5-react (dev)
$ git status
On branch dev
Your branch is up to date with 'origin/dev'.
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: src/layouts/Layout.js
modified: src/pages/Recommend/Recommend.js
modified: src/pages/Uninstall/Uninstall.js
modified: src/pages/Uninstall/Uninstall.module.less
modified: src/pages/Update/Update.js
modified: src/pages/Update/Update.module.less
Untracked files:
(use "git add <file>..." to include in what will be committed)
package-lock.json
src/actions/welcomePopUp.js
src/constants/welcomePopUp.js
src/pages/WelcomPopUp/
src/reducers/welcomePopUp.js
src/sagas/welcomePopUp.js
src/static/
no changes added to commit (use "git add" and/or "git commit -a")
毓@▒▒ع▒▒ MINGW64 /e/leo/real/pc-app-store-h5-react (dev)
$ git checkout local
Switched to branch 'local'
M src/layouts/Layout.js
M src/pages/Recommend/Recommend.js
M src/pages/Uninstall/Uninstall.js
M src/pages/Uninstall/Uninstall.module.less
M src/pages/Update/Update.js
M src/pages/Update/Update.module.less
毓@▒▒ع▒▒ MINGW64 /e/leo/real/pc-app-store-h5-react (local)
$ git merge dev
Updating 945de49..2c7c56e
Fast-forward
.gitlab-ci.yml | 19 +++++++++++
src/actions/native.js | 11 ++++++-
src/actions/post.js | 8 -----
src/actions/user.js | 7 ----
src/constants/native.js | 3 ++
src/constants/post.js | 3 --
src/constants/user.js | 3 --
src/index.css | 1 +
src/index.js | 15 ---------
src/layouts/Search.js | 3 ++
src/nativeapi/index.js | 3 +-
src/nativeapi/locals.js | 88 +++++++++++++++++++++++++++++++++++++++++++++++++
src/nativeapi/utils.js | 18 ----------
src/reducers/native.js | 15 ++++++---
src/reducers/post.js | 38 ---------------------
src/reducers/user.js | 38 ---------------------
src/sagas/index.js | 5 +--
src/sagas/native.js | 26 ++++++++++++---
src/sagas/post.js | 23 -------------
src/sagas/search.js | 1 -
src/sagas/user.js | 23 -------------
src/utils/utils.js | 73 +++++++++++-----------------------------
22 files changed, 179 insertions(+), 245 deletions(-)
create mode 100644 .gitlab-ci.yml
delete mode 100644 src/actions/post.js
delete mode 100644 src/actions/user.js
delete mode 100644 src/constants/post.js
delete mode 100644 src/constants/user.js
create mode 100644 src/nativeapi/locals.js
delete mode 100644 src/reducers/post.js
delete mode 100644 src/reducers/user.js
delete mode 100644 src/sagas/post.js
delete mode 100644 src/sagas/user.js
毓@▒▒ع▒▒ MINGW64 /e/leo/real/pc-app-store-h5-react (local)
$
