|
73 | 73 |
|
74 | 74 | // MARK: - MergeConflict |
75 | 75 |
|
76 | | - @Test func mergeConflict_mergedValues_canonicalConflict() { |
| 76 | + @Test func mergeConflict_resolvedValues_canonicalConflict() { |
77 | 77 | let conflict = MergeModel.makeCanonicalConflict() |
78 | 78 |
|
79 | 79 | // Scenario 1: No changes |
80 | | - #expect(conflict.mergedValue(for: \.field1, policy: .latest) == "foo") |
| 80 | + #expect(conflict.resolvedValue(for: \.field1, policy: .latest) == "foo") |
81 | 81 | // Scenario 2: Client-only change |
82 | | - #expect(conflict.mergedValue(for: \.field2, policy: .latest) == "bar") |
| 82 | + #expect(conflict.resolvedValue(for: \.field2, policy: .latest) == "bar") |
83 | 83 | // Scenario 3: Server-only change |
84 | | - #expect(conflict.mergedValue(for: \.field3, policy: .latest) == "baz") |
| 84 | + #expect(conflict.resolvedValue(for: \.field3, policy: .latest) == "baz") |
85 | 85 | // Scenario 4: Both changed, server newer |
86 | | - #expect(conflict.mergedValue(for: \.field4, policy: .latest) == "baz") |
| 86 | + #expect(conflict.resolvedValue(for: \.field4, policy: .latest) == "baz") |
87 | 87 | // Scenario 5: Both changed, client newer |
88 | | - #expect(conflict.mergedValue(for: \.field5, policy: .latest) == "bar") |
| 88 | + #expect(conflict.resolvedValue(for: \.field5, policy: .latest) == "bar") |
89 | 89 | // Scenario 6: Both changed, equal timestamps (server wins) |
90 | | - #expect(conflict.mergedValue(for: \.field6, policy: .latest) == "baz") |
| 90 | + #expect(conflict.resolvedValue(for: \.field6, policy: .latest) == "baz") |
91 | 91 | // Scenario 7: Both changed, same value |
92 | | - #expect(conflict.mergedValue(for: \.field7, policy: .latest) == "bar") |
| 92 | + #expect(conflict.resolvedValue(for: \.field7, policy: .latest) == "bar") |
93 | 93 | } |
94 | 94 |
|
95 | 95 | @Test func mergeConflict_resolutionRoundtrip_canonicalConflict() throws { |
|
0 commit comments