使用cherry-pick git push 来自其他branch的代码

最新推荐文章于 2024-08-24 16:13:06 发布

shanzhahe_yanpli

最新推荐文章于 2024-08-24 16:13:06 发布

阅读量261

点赞数

文章标签： git github

本文链接：https://blog.csdn.net/shanzhahe_yanpli/article/details/130284868

版权

Cherrypick

1.定位到satellite6.15 branch, 创建两个文件 cherrypic15.txt 和cherrypic15_new.txt

(python3_vv) [yanpliu@yanpliu virtwho-plugin]$ git checkout satellite6.15

Switched to branch 'satellite6.15'


(python3_vv) [yanpliu@yanpliu virtwho-plugin]$ touch cherrypic15.txt

(python3_vv) [yanpliu@yanpliu virtwho-plugin]$ touch cherrypic15_new.txt

2. 分两次提交这两个文件

(python3_vv) [yanpliu@yanpliu virtwho-plugin]$ git add cherrypic15.txt

(python3_vv) [yanpliu@yanpliu virtwho-plugin]$ git commit -m "add cherrypick15"

[satellite6.15 02f9056] add cherrypick15

 1 file changed, 0 insertions(+), 0 deletions(-)

 create mode 100644 cherrypic15.txt


(python3_vv) [yanpliu@yanpliu virtwho-plugin]$ git add cherrypic15_new.txt

(python3_vv) [yanpliu@yanpliu virtwho-plugin]$ git commit -