我需要合并几个存储库（每个存储库都是从TFS http://en.wikipedia.org/wiki/Team_Foundation_Server）合而为一。为此，我使用 gitcherry-pick 命令，该命令适用于某些提交，但不适用于其他提交：
$ git status
# On branch master
nothing to commit, working directory clean
$ git diff-tree --no-commit-id --name-only -r e2d8405
Libraries/IFileTransformer/ITransformer.cs
Libraries/IFileTransformer/IFileTransformer.csproj
Libraries/IFileTransformer/IFileTransformer.csproj.vspscc
Libraries/IFileTransformer/Properties/AssemblyInfo.cs
$ git cherry-pick e2d8405
error: could not apply e2d8405... TFS changeset 2836
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 master
# You are currently cherry-picking.
# (fix conflicts and run "git commit")
#
# Unmerged paths:
# (use "git add/rm <file>..." as appropriate to mark resolution)
#
# deleted by them: Libraries/IFileTransformer/ITransformer.cs
# deleted by them: Libraries/IFileTransformer/IFileTransformer.csproj
# deleted by them: Libraries/IFileTransformer/IFileTransformer.csproj.vspscc
# deleted by them: Libraries/IFileTransformer/Properties/AssemblyInfo.cs
#
no changes added to commit (use "git add" and/or "git commit -a")
$
我如何找出这里出了什么问题？ “他们”是谁？在我看来，e2d8405 提交删除了这四个文件。如果文件存在（并且确实存在），那么应用提交的问题出在哪里？
$ git checkout e2d8405^
Note: checking out 'e2d8405^'.
You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by performing another checkout.
If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -b with the checkout command again. Example:
git checkout -b new_branch_name
HEAD is now at 48b5b2f... TFS changeset 2835 renamed namespace installutils to
utils
$ md5sum IFileTransformer.csproj
9f9851dc9db3bddd1e6920631fa14e8b *IFileTransformer.csproj
$ git checkout master
Previous HEAD position was 48b5b2f... TFS changeset 2835 renamed namespace ins
tallutils to utils
Switched to branch 'master'
$ md5sum IFileTransformer.csproj
9f9851dc9db3bddd1e6920631fa14e8b *IFileTransformer.csproj
尽管该提交删除了这些文件，但您进行了已删除版本中不存在的修改。由于此处修改文件的分支与删除文件的分支之间存在冲突，因此您需要通过表明您愿意放弃更改并应用删除来解决该冲突（git rm ...）。一旦你做到了这一点，git commit创建精心挑选的提交。
本文内容由网友自发贡献，版权归原作者所有，本站不承担相应法律责任。如您发现有涉嫌抄袭侵权的内容，请联系:hwhale#tublm.com(使用前将#替换为@)
