From 76630bcf52e86fbfdfb44c49d3d883c4fd2d96cd Mon Sep 17 00:00:00 2001
From: Tim Robinson <tim@timjrobinson.com>
Date: Tue, 13 Sep 2016 15:50:49 +0000
Subject: [PATCH] Move the save tab after the conflict is resolved to not
 trigger many change dialogs

---
 plugins/c9.ide.watcher/gui.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/c9.ide.watcher/gui.js b/plugins/c9.ide.watcher/gui.js
index 38f599e4..cec4bd21 100644
--- a/plugins/c9.ide.watcher/gui.js
+++ b/plugins/c9.ide.watcher/gui.js
@@ -352,8 +352,8 @@ define(function(require, exports, module) {
             var doc = tab.document;
             doc.setBookmarkedValue(data, true);
             doc.meta.timestamp = Date.now() - settings.timeOffset;
-            save.save(tab);
             changedPaths[path].resolve();
+            save.save(tab);
         }
         
         function mergeChangedPath(err, path, data) {