Add conflict handling and flags for uploads

1 files changed, 12 insertions, 0 deletions

diff --git a/drive/sync.go b/drive/sync.go
index f39c1c6..204e7c2 100644
--- a/drive/sync.go
+++ b/drive/sync.go
@@ -510,6 +510,18 @@ func findLocalConflicts(files []*changedFile) []*changedFile {
     return conflicts
 }
 
+func findRemoteConflicts(files []*changedFile) []*changedFile {
+    var conflicts []*changedFile
+
+    for _, cf := range files {
+        if cf.compareModTime() == RemoteLastModified {
+            conflicts = append(conflicts, cf)
+        }
+    }
+
+    return conflicts
+}
+
 type byLocalPathLength []*LocalFile
 
 func (self byLocalPathLength) Len() int {