git merge

最新推荐文章于 2024-07-13 09:15:37 发布

yizheng_zeng

最新推荐文章于 2024-07-13 09:15:37 发布

阅读量91

点赞数

分类专栏： git 文章标签： git

本文链接：https://blog.csdn.net/yizheng_zeng/article/details/132219859

版权

git 专栏收录该内容

1 篇文章 0 订阅

订阅专栏

hz@h:~/Project/R18.5/common-gui$ git branch
* master
hz@h:~/Project/R18.5/common-gui$ git status
On branch master
Your branch is up to date with 'origin/master'.

nothing to commit, working tree clean
hz@h:~/Project/R18.5/common-gui$ git branch -a |grep R18
remotes/origin/R18.1.1
remotes/origin/R18.1.2
remotes/origin/R18.1.x
hz@h:~/Project/R18.5/common-gui$ git checkout -b R18.1.x remotes/origin/R18.1.x
Branch 'R18.1.x' set up to track remote branch 'R18.1.x' from 'origin'.
Switched to a new branch 'R18.1.x'
hz@h:~/Project/R18.5/common-gui$ git merge master
hz@h:~/Project/R18.5/common-gui$ git commit --amend (会出现提示信息，加上提交的单号 [NGB-XXXX]: )
[R18.1.x b18ed51] [WDMDEV-62006]:Merge branch 'master' into R18.1.x
Date: Fri Nov 1 11:36:24 2019 +0800
hz@h:~/Project/R18.5/common-gui$ git push origin R18.1.x
Counting objects: 4, done.