刚才我对另一个问题有了建议，并尝试将我的功能分支合并到主干工作副本目录中的主干工作副本。由于一些冲突，我使用 KDiff3 来解决它们。但我不确定这里的“基地”、“我的”和“他们”是什么意思？就我而言（将分支合并到主干）：
我的 --- 主干的工作副本，
基础 --- ???
他们的 - - ？？？
另一个基本问题：
解决冲突并保存后，编辑后的版本将保存在主干的本地工作副本中。我的理解正确吗？
实际上，我已经用谷歌搜索了一段时间，以避免这里提出的相同简单问题。但是我找不到关于这些虚拟问题的任何简单解释。
Just now I've got suggestions to my another question and am trying to merge my feature branch to the working copy of the trunk in the working copy directory of the trunk. Due to a couple of conflicts I'm using KDiff3 to resolve them. However I'm not sure what here Base, Mine and Their mean? In my case (merge branch to trunk):
Mine --- the working copy of the trunk,
Base --- ???
Their --- ???
Another basic question:
After resolving the conflicts and saving, the edited version will be saved in the local working copy of the trunk. Is my understanding correct?
Actually I've googled awhile in oder to avoid same simple questions which are put forwards here. However I cannot find any simple explanations regarding to these dummy questions.
发布评论
评论（1）
基地、我的和他们的只是三向差异中的三个名字。您可以在这些领域的任何领域（基地、我的、他们的）使用任何副本。但这样做是有意义的：
这意味着，您将签出到工作目录的版本。您更改了它，在提交之前，您必须将其他人所做的编辑合并到您的工作副本中。因此，您可以进行三向比较来查看原始（基础）与您的编辑（我的）与冲突的编辑（他们的） ）。您浏览它并将其合并到工作副本中的版本中。
完成后，您可以测试它（编译或任何您必须测试的内容）并提交它。
kdiff3 文档中的三向差异： http://kdiff3.sourceforge.net/doc/ Documentation.html#id2488370
以及 svn 书中的解释： http://svnbook.red-bean.com/en/1.1/ch03s05.html#svn-ch-3-sect-5.4
Base, Mine And Theirs are just three names in a three-way-diff. You can use any copy in any field of those (base, mine, theirs). But it makes sense to do like this:
That means, that you have the version you checked out into your working directory. You changed it and before you can commit you have to merge the edits others did into your working copy. So you do a three-way-diff to see original (Base) vs. your edits (Mine) vs. the conflicting edits (Theirs). You go through it and merge it into your version in your working copy.
When you are done you test it (compile or whatever you have to test) and commit it.
three-way-diff in kdiff3 documentation: http://kdiff3.sourceforge.net/doc/documentation.html#id2488370
And explanation in a svn book: http://svnbook.red-bean.com/en/1.1/ch03s05.html#svn-ch-3-sect-5.4