当我们使用 subree 合并策略时，git 如何找到子树？
当我们使用子树合并策略时，git如何找到子树？我发现这里只提到了一个 ：“它实际上猜测您想要合并的子树。通常，这神奇地被证明是正确的，但是如果您的子树包含很多更改（或者最初是空的，或者其他什么），那么它可能会失败非常壮观。” 它如何猜测？如果失败我该怎么办？ 自 2009 年 8 月撰写该答案以来是否发生了变化？
How does git find subtree, when we use subtree merging strategy? I find only one mention here: "It actually guesses the subtrees that you want to merge. Usually, this magically turns out to be correct, but if your subtree contains a lot of changes (or was originally empty, or whatever), then it can fail spectacularly."
How does it guess and what can i do, if it fails?
Is something changed since aug'09, when that answer were written?
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（1）
以下是一些有关子树合并的有用文章：
http: //blog.brad.jones.name/2011/10/52/merging-two-git-repositories-history
http://kernel.org/pub/software/scm /git/docs/howto/using-merge-subtree.html
https://help.github.com/articles/working-with-subtree-merge
自询问日期以来，子树合并的状态已发生变化，包括添加
-- Xsubtree=参数允许您绕过“猜测”。Here are some helpful articles about subtree merging:
http://blog.brad.jones.name/2011/10/52/merging-two-git-repositories-history
http://kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html
https://help.github.com/articles/working-with-subtree-merge
The state of subtree merges has changed since the date asked, including the addition of
--Xsubtree=parameter to allow you to bypass the "guess".