git merge

最新推荐文章于 2024-07-13 17:35:54 发布

bantinghy

最新推荐文章于 2024-07-13 17:35:54 发布

阅读量45

点赞数

分类专栏： Git 文章标签： git linux 服务器

本文链接：https://blog.csdn.net/u011743621/article/details/131825008

版权

Git 专栏收录该内容

28 篇文章 0 订阅

订阅专栏

git merge

Step1:切换到被merged的分支

Banting@DESKTOP-UDFLV4N MINGW64 /d/Code/github/yyy-integration-new_protocol_unit (dev/banting/new_protocol_unit)
$ git branch

* dev/banting/new_protocol_unit
  dev/james/new_protocol
  master

Banting@DESKTOP-UDFLV4N MINGW64 /d/Code/github/yyyy-integration-new_protocol_unit (dev/banting/new_protocol_unit)
$ git checkout dev/james/new_protocol
Switched to branch 'dev/james/new_protocol'
Your branch is behind 'origin/dev/james/new_protocol' by 6 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)

Banting@DESKTOP-UDFLV4N MINGW64 /d/Code/github/yyy-integration-new_protocol_unit (dev/james/new_protocol)
$ git pull
remote: Enumerating objects: 15, done.
remote: Counting objects: 100% (15/15), done.
remote: Compressing objects: 100% (7/7), done.
remote: Total 15 (delta 8), reused 15 (delta 8), pack-reused 0
Unpacking objects: 100% (15/15), 17.90 KiB | 398.00 KiB/s, done.
From github.com:wyzelabs-inc/wyze-edgeai-integration
   714f3a4..749bd8c  dev/james/new_protocol -> origin/dev/james/new_protocol
Updating 73d3a8e..749bd8c
Fast-forward
 recording/protocol.h    |   6 +-
 1 files changed, 276 insertions(+), 169 deletions(-)
 
Banting@DESKTOP-UDFLV4N MINGW64 /d/Code/github/yyy-integration-new_protocol_unit (dev/james/new_protocol)
$ git branch
  dev/banting/new_protocol_unit

* dev/james/new_protocol
  master

Step2: 切换成需要merge的分支进行merge

Banting@DESKTOP-UDFLV4N MINGW64 /d/Code/github/yyy-integration-new_protocol_unit (dev/james/new_protocol)
$ git checkout dev/banting/new_protocol_unit
Switched to branch 'dev/banting/new_protocol_unit'
Your branch is ahead of 'origin/dev/banting/new_protocol_unit' by 27 commits.
  (use "git push" to publish your local commits)

Banting@DESKTOP-UDFLV4N MINGW64 /d/Code/github/yyy-integration-new_protocol_unit (dev/banting/new_protocol_unit)
$ git merge dev/james/new_protocol
Auto-merging recording/mngHandle.cpp
Merge made by the 'ort' strategy.
 recording/protocol.h    |   6 +-
 1 files changed, 276 insertions(+), 169 deletions(-)

Banting@DESKTOP-UDFLV4N MINGW64 /d/Code/github/yyy-integration-new_protocol_unit (dev/banting/new_protocol_unit)
$