我在挑选一系列提交时遇到了问题，并且一直存在冲突，无法找出问题所在。冲突不应该发生，因为被精心挑选的提交添加/修改了接收分支中不存在的代码。
漫游：
我挑选的提交来自一个名为FeatureX的分支，提交如下所示：
>> git log --oneline
cbd0d94ca312 (HEAD -> FeatureX) Version 6
e1da344f20b7 Version 5
a9875369a8e4 Version 4
44d7975d975f Version 3
6955a667be84 Version 2
c7c70076c435 Version 1
现在，我有另一个名为MainCode的分支，我想从FeatureX分支中挑选上面的提交。如果我单独挑选：
>>git cherry-pick c7c70076c435
[MainCode 7850ed1c4a4d] Version 1
Date: Sat Jun 13 19:59:04 2020 -0700
2 files changed, 321 insertions(+), 1 deletion(-)
create mode 100644 STHelper.cs
>>git cherry-pick 6955a667be84
[MainCode df98023a9ac9] Version 2
Date: Tue Jun 16 15:36:24 2020 -0700
1 file changed, 68 insertions(+), 15 deletions(-)
>>git cherry-pick 44d7975d975f
[MainCode beede732db3f] Version 3
Date: Tue Jun 23 14:34:27 2020 -0700
1 file changed, 104 insertions(+), 23 deletions(-)
>>git cherry-pick a9875369a8e4
[MainCode 77664b1d36c2] Version 4
Date: Wed Jul 8 21:25:27 2020 -0700
1 file changed, 25 insertions(+), 15 deletions(-)
>>git cherry-pick e1da344f20b7
[MainCode 8eb1c3cf9828] Version 5
Date: Fri Jul 10 03:39:47 2020 -0700
1 file changed, 67 insertions(+), 19 deletions(-)
>>git cherry-pick cbd0d94ca312
[MainCode a07e9f4dbed9] Version 6
Date: Fri Jul 10 14:28:10 2020 -0700
3 files changed, 174 insertions(+), 35 deletions(-)
create mode 100644 config_debug.xml
它运行良好。但如果我试着把它们摘在一起。。。
>>git cherry-pick c7c70076c435^..cbd0d94ca312
error: could not apply 6955a667be84... Version 2
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
>>git status
On branch MainCode
Cherry-pick currently in progress.
(fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Unmerged paths:
(use "git add/rm <file>..." as appropriate to mark resolution)
deleted by us: STHelper.cs
no changes added to commit (use "git add" and/or "git commit -a")
存在冲突。我还尝试使用their更改(即FeatureX分支的更改(来尝试解决冲突。。。
>>git cherry-pick c7c70076c435^..cbd0d94ca312 --strategy=recursive -X theirs
error: could not apply 6955a667be84... Version 2
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
但它仍然不起作用。
有人能告诉我这里出了什么问题吗？
[edit]我在windows上使用cmd.exe作为shell。
这是一个shell问题：如注释中所述，您使用的是cmd.exe，其中^是转义符
(例如，请参阅ss64.com上的此链接：Windows命令行的转义符(。
您的输入字符串：
c7c70076c435^..cbd0d94ca312
变成：
c7c70076c435..cbd0d94ca312
并且第一次提交被跳过。
如果您坚持使用cmd.exe：请使用~1(如@LasseVKarlsen所建议的(或^^，而不是普通的^:
git cherry-pick c7c70076c435^^..cbd0d94ca312