什么是three-way merge
来源:互联网 发布:spark快速大数据分析 编辑:程序博客网 时间:2024/05/18 17:03
A, B and C means three-way. C是A和B的父亲,D是A和Bmerge之后的结果
The three-way merge uses the ancestor of the changed files to identify blocks of content that have changed in neither, one, or both of the derived versions.
使用C的内容来标记A和B的内容有没有改变(1.A和B都没有变,2.A或者B变了;3.A和B都变了)
Blocks that have changed in neither are left as they are. 如果是1的话,不需要merge。
Blocks that have changed in only one derivative use that changed version. 如果是2的话,D的内容和改变了的A或B一样。
If a block is changed in both derivatives, the changed version is used if it has the same content on both sides,
如果是3的话,有分为两种,A和B的改动一样,则D的内容和A或者B一样;
but if the changes differ, it is marked as a conflict situation and left for the user to resolve.
但是如果A和B的改动不一样的话,这时就会进入冲突模式,需要人去手动的解决了。
下图就是在clearcase中出现冲突后使用xmerge解决冲突的截图(相关code我已经隐去)。
http://en.wikipedia.org/wiki/Diff3
kdiff3.sourceforge.net
- 什么是three-way merge
- TCP Three Way Handshake
- TCP Three-Way handshake
- 三分法 three-way partitioning
- Three way for Binding Application
- 三次握手Three-way Handshake
- codechef Three Way Communications 题解
- three way of waterfall flow
- Two-way, Three-way and Four-way matching
- QuickSort two way, three way partition and many other implementations
- 著名的三次握手(three-way handshake)
- TCP三次握手(Three-way Handshake)
- sql 2008 Study for three -----Merge
- Android RadioButton class three kinds of checked way
- TCP Connection Establishment Process: The "Three-Way Handshake"
- (译)第二部分:什么是merge?
- Internal Sorting: Straight Two-way Merge Sort: Sorting by Merging
- Internal Sorting: Natural Two-way Merge Sort: Sorting by Merging
- Rails/Ruby获取时间及格式化
- Nonpaged Pool(非分页池) 和 Paged Pool(分页池) 在Windows中的用处
- Android按比例布局
- usb_submit_urb流程分析
- 二分查找
- 什么是three-way merge
- RELY约束
- 黑马程序员--C#中for和foreach的区别
- 通过打印读代码
- (动态规划)1042最长公共子序列问题
- Java反射机制总结
- 常见向量范数和矩阵范数
- LDR指令详解
- innerHTML、innerText 和 outerHTML 的区别