问题描述
在明确情况下重新开发流时，有时需要合并文件，因为本地版本与建议的基准中的本地版本不同步。
直观地讲，我当时是认为合并工具将提供两个选项：文件1（本地）和文件2（在建议的基准下）。
但实际上，我被要求从3个文件中选择。这3个文件是什么？
While rebasing the development stream in clear case, there are some times where a file needs to be merged because the local version is out of sync with one in the recommended baseline.
Now intuitively, I was thinking that merge tool will offer two options :file 1(local) and file 2:(in recommended baseline).
But in reality, I am being asked to choose from 3 files. What are these 3 files?
推荐答案
这3个文件是：
- 共同祖先（或基本贡献者）
- 源（或源贡献者）
- 目的地
这是三向合并。请参阅
This is a three-way merge. See "What are the basic clearcase concepts every developer should know?"
（第四个屏幕是最终结果）
(and the fourth screen is the end result)
另请参阅 rel = nofollow noreferrer>如何合并文件和目录
See also "How files and directories are merged"
这篇关于在清楚的情况下重新合并的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持！