Dont overwrite a file modified on both sides

cozy-labs · Apr 24, 2017 · 8f79a44 · 8f79a44
1 parent 3de88a1
commit 8f79a44
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/merge.js b/src/merge.js
@@ -180,6 +180,8 @@ class Merge {
         if (doc.size == null) { doc.size = file.size }
         if (doc.class == null) { doc.class = file.class }
         if (doc.mime == null) { doc.mime = file.mime }
+      } else if (!isUpToDate(side, doc)) {
+        return this.resolveConflictAsync(side, doc)
       }
       if (sameFile(file, doc)) {
         log.info({doc}, 'up to date')