Slide 54
Slide 54 text
person = {
name: “Jennifer”,
age: 32,
hobbies: [“climbing”, “reading”]
}
person = {
name: “Jennifer”,
age: 32,
hobbies: [“climbing”,“karaoke”]
}
client a client b
CONFLICT RESOLUTION - AUTO MERGE
Lists
person = {
name: “Jennifer”,
age: 32,
hobbies: [“climbing”, “karaoke”, “reading”]
}
new item