Fix updates

Author: cbaker6

Sources/ParseCareKit/Models/PCKRevisionRecord.swift

@@ -112,15 +112,12 @@ struct PCKRevisionRecord: ParseObject, Equatable, Codable {
              logicalClock, clock, clockUUID
     }
 
-    func convertToCareKit(_ vector: OCKRevisionRecord.KnowledgeVector? = nil) throws -> OCKRevisionRecord {
+    func convertToCareKit() throws -> OCKRevisionRecord {
         guard let entities = entities,
-            var knowledgeVector = knowledgeVector else {
+            let 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(knowledgeVector)
+                        let record = try await revision.fetchEntities().convertToCareKit()
                         mergeRevision(record)
                         self.notifyRevisionProgress(index + 1,
                                                     total: revisions.count)
@@ -393,8 +393,20 @@ public class ParseRemote: OCKRemoteSynchronizable {
             if shouldIncrementClock {
                 // Increment Knowledge Vector
                 updatedParseVector = incrementVectorClock(updatedParseVector)
+                updatedParseVector.merge(with: localClock)
+            } else {
+                updatedParseVector.merge(with: localClock)
+                guard updatedParseVector.uuids.count > parseVector.uuids.count else {
+                    Logger.pushRevisions.debug("Finished pushing revisions")
+                    await self.remoteStatus.notSynchronzing()
+                    await self.subscribeToRevisionRecord()
+                    DispatchQueue.main.async {
+                        self.parseRemoteDelegate?.successfullyPushedDataToCloud()
+                    }
+                    completion(nil)
+                    return
+                }
             }
-            updatedParseVector.merge(with: localClock)
 
             guard let updatedClock = PCKClock.encodeVector(updatedParseVector, for: parseClock) else {
                 await self.remoteStatus.notSynchronzing()