3-way-merge 中文文档教程
merge(o, a, b) -> c
JavaScript 对象的 3 向合并
采用同一对象的 3 个版本——其中版本 2 和版本 3 均派生自版本 1—— 并生成第 4 个版本,有效地将第 2 版和第 3 版合并在一起。 当发生冲突时 检测到(在版本 2 和 3 中都进行了更改)使用了版本 3 的更改。
Prototype
merge(Object original, Object current, Object new) -> Object
original
:versionA
和versionB
的祖先版本(原始版本)current
:的版本 A >original
new
:original
版本 B
Example:
// The original version which both A and B are derived from
original = {
aliases: {
abc: "Abc"
},
deleted: 7890,
key: "string",
list: [
"abc",
"def"
],
value: 1234
}
// Version A
current = {
aliases: {
"abc": "Abcdef",
"def": "Def"
},
list: [
"abc",
"cat",
"def",
"xyz"
],
value: 123456
}
// Version B
B = {
aliases: {
abc: "Abc",
aab: "Aab"
},
list: [
"abc",
"zzz"
],
value: 1234
}
// --> Merged result
{
aliases: {
abc: "Abcdef",
aab: "Aab",
def: "Def"
},
list: [
"abc",
"cat",
"xyz",
"zzz"
],
value: 123456
}
Requirements
Array.isArray(object) -> Boolean
to be implemented (which it is already in modern JavaScript environments)
merge(o, a, b) -> c
3-way merging of JavaScript objects
Takes 3 versions of the same object -- where version 2 and 3 are both derived from version 1 -- and generates a 4th version, effectively merging version 2 and 3 together. When a conflict is detected (changes made in both version 2 and 3) changes from version 3 are used.
Prototype
merge(Object original, Object current, Object new) -> Object
original
: Ancestor version (original) from which bothversionA
andversionB
are derivedcurrent
: Version A oforiginal
new
: Version B oforiginal
Example:
// The original version which both A and B are derived from
original = {
aliases: {
abc: "Abc"
},
deleted: 7890,
key: "string",
list: [
"abc",
"def"
],
value: 1234
}
// Version A
current = {
aliases: {
"abc": "Abcdef",
"def": "Def"
},
list: [
"abc",
"cat",
"def",
"xyz"
],
value: 123456
}
// Version B
B = {
aliases: {
abc: "Abc",
aab: "Aab"
},
list: [
"abc",
"zzz"
],
value: 1234
}
// --> Merged result
{
aliases: {
abc: "Abcdef",
aab: "Aab",
def: "Def"
},
list: [
"abc",
"cat",
"xyz",
"zzz"
],
value: 123456
}
Requirements
Array.isArray(object) -> Boolean
to be implemented (which it is already in modern JavaScript environments)