Discuss / Git / 我的实操结果

我的实操结果

Topic source

农夫三拳

#1 Created at ... [Delete] [Delete and Lock User]

我切换到dev分支,准备使用cherry-pick复制issue-101的bug修复内容时,得到的警告如下:

$ git cherry-pick 1eec3
error: Your local changes to the following files would be overwritten by merge:
        readme.txt
Please commit your changes or stash them before you merge.
Aborting
fatal: cherry-pick failed

所以它告诉我,在合并bug修复内容之前,dev分支之前的修改应继续stash,而不要恢复。

所以我继续stash一下,就能成功合并了。

$ git stash
Saved working directory and index state WIP on dev: 44b932e save edit on branch dev

$  git cherry-pick 1eec3
[dev4 e469150] fix bug 101
 Date: Tue Aug 23 10:16:12 2022 +0800

农夫三拳

#2 Created at ... [Delete] [Delete and Lock User]

上一段补充:“所以它告诉我,在合并bug修复内容之前,dev分支之前的修改应继续stash,而不要恢复”,——“恢复”指的是使用git stash pop恢复之前dev分支隐藏的工作进度。

李大伟

#3 Created at ... [Delete] [Delete and Lock User]

您好,同学。我按照您说的,先check-pick,然后在stash pop,结果还是显示冲突。


  • 1

Reply