merge knowledge vectors during pullRequest

Author: cbaker6

Sources/ParseCareKit/Models/PCKRevisionRecord.swift

@@ -112,12 +112,15 @@ struct PCKRevisionRecord: ParseObject, Equatable, Codable {
              logicalClock, clock, clockUUID
     }
 
-    func convertToCareKit() throws -> OCKRevisionRecord {
+    func convertToCareKit(_ vector: OCKRevisionRecord.KnowledgeVector? = nil) throws -> OCKRevisionRecord {
         guard let entities = entities,
-            let knowledgeVector = knowledgeVector else {
+            var knowledgeVector = knowledgeVector else {
             throw ParseCareKitError.couldntUnwrapSelf
         }
         let careKitEntities = try entities.compactMap { try $0.careKit() }
+        if let vector = vector {
+            knowledgeVector.merge(with: vector)
+        }
         return OCKRevisionRecord(entities: careKitEntities,
                                  knowledgeVector: knowledgeVector)
     }

Sources/ParseCareKit/ParseRemote.swift

@@ -280,7 +280,7 @@ public class ParseRemote: OCKRemoteSynchronizable {
                                                 total: revisions.count)
                     // 2.1 Merge revisions
                     for (index, revision) in revisions.enumerated() {
-                        let record = try await revision.fetchEntities().convertToCareKit()
+                        let record = try await revision.fetchEntities().convertToCareKit(knowledgeVector)
                         mergeRevision(record)
                         self.notifyRevisionProgress(index + 1,
                                                     total: revisions.count)