Rename MergeConflict.mergedValue to resolvedValue · structuredpath/sqlite-data@3cf842e · GitHub
Skip to content

Commit 3cf842e

Browse files
committed
Rename MergeConflict.mergedValue to resolvedValue
Establishes one verb for what conflicts do, ahead of a second conflict type for two-way reconciliation. The merge and reconcile vocabulary stays with FieldMergePolicy, whose closures the conflicts resolve with.
1 parent 3dc53ae commit 3cf842e

2 files changed

Lines changed: 14 additions & 14 deletions

File tree

‎Sources/SQLiteData/CloudKit/MergeConflictHandling.swift‎

Lines changed: 6 additions & 6 deletions

‎Tests/SQLiteDataTests/CloudKitTests/MergeConflictCoreTests.swift‎

Lines changed: 8 additions & 8 deletions

0 commit comments

Comments
 (0)