The dev git branch local branch merged with the local update
tags: git
▒▒ع▒▒ 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'.
Yu @ ▒▒ع▒▒ MINGW64 / e / leo / real / pc-app-store-h5-react (dev)
$ git branch
* dev
local
master
Yu @ ▒▒ع▒▒ 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
Yu @ ▒▒ع▒▒ 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
Yu @ ▒▒ع▒▒ 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")
Yu @ ▒▒ع▒▒ 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
Yu @ ▒▒ع▒▒ 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
Yu @ ▒▒ع▒▒ MINGW64 / e / leo / real / pc-app-store-h5-react (local)
$
Intelligent Recommendation
Git own branch merged DEV branch
Git own branch merged DEV branch The full process git consolidation code step, you need to ensure that your local branch and dev branch are the latest code to ensure that the code will not be lost. No...
Git on the local branch and a remote branch
Git local branch and a remote branch: Check local branch: git branch View all branches: git branch -a Create a branch test: git branch test // [No...
git--local branch and remote branch
Create an empty folder locally, and then git clone the remote address, you can pull all the projects of the remote master to the local git branch is used to view branch information, git branch -a to v...
Git local branch and remote branch
Git switches to the specified remote branch When we use git for development, we often encounter situations where we need to switch remote branches and submit to the remote designated branch. Now recor...
[Git] local branch and distal branch
Pull the remote B code to local A, local A development, remote A as the seclusion of local A (1, 2, 3, 4): Merge the local A code with the dista...
More Recommendation
git failed to update remote branch to local
Phenomenon: After creating the remote branch dev, locallygit pull , No remote branch updates appear carried outgit push origin devReport an error carried outgit fetch origin devReport an error carried...
Git update the remote branch list to the local area
The cause of demand: When a new branch is created remotely or deleted a certain branch, the local may not be updated to the latest branch list in real time. As a result: At this time, you will find th...
git delete branch, local branch, remote branch
Foreword: Git git delete branch command aims: Let's delete the dev branch of git here step: One: view all branches git branch -a (View all current branches) &nb...
Git quickly remove the local have been merged into the master branch
principle: git branch --merged master List all have been merged into the master branch grep -v '^[ *]*master$' In the master branch exclude results xargs git branch -d Deleted branches...
Git command & dev branch merged into master
1. First mention the changes to dev 2. Switch to the local master 3. Synchronize the remote master code 4. Then merge dev into the master 5. Push the merged branch to the remote repository...