Git: 将本地local分支合并到本地的dev分支,并push到远程的dev分支上

毓@▒▒ع▒▒ MINGW64 /e/leo/real/pc-app-store-h5-react (local)
$ git branch
  dev
* local
  master

毓@▒▒ع▒▒ MINGW64 /e/leo/real/pc-app-store-h5-react (local)
$ git add .

毓@▒▒ع▒▒ MINGW64 /e/leo/real/pc-app-store-h5-react (local)
$ git commit -m 'first sumbmission of local'
[local 1c2e34c] first sumbmission of local
 17 files changed, 542 insertions(+), 344 deletions(-)
 create mode 100644 src/actions/uninstall.js
 create mode 100644 src/constants/unintall.js
 rewrite src/pages/Uninstall/Uninstall.js (69%)
 rewrite src/reducers/native.js (60%)
 rewrite src/static/AppMsgList.js (95%)
 create mode 100644 src/static/mask_close.png

毓@▒▒ع▒▒ MINGW64 /e/leo/real/pc-app-store-h5-react (local)
$ git checkout dev
Switched to branch 'dev'
Your branch is ahead of 'origin/dev' by 3 commits.
  (use "git push" to publish your local commits)

毓@▒▒ع▒▒ 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 merge local
Updating 4f2d01b..1c2e34c
Fast-forward
 package-lock.json                              |  17 ++--
 package.json                                   |   1 +
 src/actions/native.js                          |   7 --
 src/actions/uninstall.js                       |  24 +++++
 src/constants/native.js                        |   3 +-
 src/constants/unintall.js                      |   3 +
 src/pages/Uninstall/Uninstall.js               | 127 +++++++++++--------------
 src/pages/Uninstall/Uninstall.module.less      |  98 +++++++++++++------
 src/pages/Update/Update.js                     |  76 ++++++++++-----
 src/pages/Update/Update.module.less            |  19 ++++
 src/pages/WelcomPopUp/WelcomePopUp.js          |  57 +++++------
 src/pages/WelcomPopUp/WelcomePopUp.module.less |  72 ++++++++++++++
 src/reducers/native.js                         |  53 +++++++----
 src/sagas/native.js                            |  12 ++-
 src/static/AppMsgList.js                       | 112 +++++++++++-----------
 src/static/mask_close.png                      | Bin 0 -> 537 bytes
 src/utils/utils.js                             |  19 +++-
 17 files changed, 449 insertions(+), 251 deletions(-)
 create mode 100644 src/actions/uninstall.js
 create mode 100644 src/constants/unintall.js
 create mode 100644 src/static/mask_close.png

毓@▒▒ع▒▒ MINGW64 /e/leo/real/pc-app-store-h5-react (dev)
$ git push origin dev
Enumerating objects: 163, done.
Counting objects: 100% (134/134), done.
Delta compression using up to 4 threads
Compressing objects: 100% (91/91), done.
Writing objects: 100% (91/91), 240.38 KiB | 5.23 MiB/s, done.
Total 91 (delta 47), reused 0 (delta 0)
remote:
remote: To create a merge request for dev, visit:
remote:   http://10.109.5.54/zhangxf26/pc-app-store-h5-react/merge_requests/new?merge_request%5Bsource_branch%5D=dev
remote:
To 10.109.5.54:zhangxf26/pc-app-store-h5-react.git
   3f601cb..1c2e34c  dev -> dev

毓@▒▒ع▒▒ MINGW64 /e/leo/real/pc-app-store-h5-react (dev)
$ ^C

毓@▒▒ع▒▒ MINGW64 /e/leo/real/pc-app-store-h5-react (dev)
$ ^C

毓@▒▒ع▒▒ MINGW64 /e/leo/real/pc-app-store-h5-react (dev)
$
 

  • 0
    点赞
  • 0
    收藏
    觉得还不错? 一键收藏
  • 0
    评论
评论
添加红包

请填写红包祝福语或标题

红包个数最小为10个

红包金额最低5元

当前余额3.43前往充值 >
需支付:10.00
成就一亿技术人!
领取后你会自动成为博主和红包主的粉丝 规则
hope_wisdom
发出的红包
实付
使用余额支付
点击重新获取
扫码支付
钱包余额 0

抵扣说明:

1.余额是钱包充值的虚拟货币,按照1:1的比例进行支付金额的抵扣。
2.余额无法直接购买下载,可以购买VIP、付费专栏及课程。

余额充值