Before save is called check tab conflicts are resolved

package.json

@@ -106,7 +106,7 @@
         "c9.ide.run": "#cc9d80f8bb",
         "c9.ide.run.build": "#ad45874c88",
         "c9.ide.run.debug.xdebug": "#3b1520f83d",
-        "c9.ide.save": "#abaa26f320",
+        "c9.ide.save": "#75fc15aafb",
         "c9.ide.terminal.monitor": "#b0b4d03280",
         "c9.ide.theme.flat": "#b1d65fa9bb",
         "c9.ide.threewaymerge": "#229382aa0b",

plugins/c9.ide.watcher/gui.js

@@ -102,6 +102,9 @@ define(function(require, exports, module) {
             
             save.on("beforeSave", function(e) {
                 e.document.meta.$savingValue = e.save;
+                if (e.tab.classList.contains("conflict")) {
+                    showChangeDialog(e.tab);
+                }
             }, plugin);
             
             save.on("afterSave", function(e) {
@@ -367,9 +370,7 @@ define(function(require, exports, module) {
                 else {
                     changedPaths[path].tab.document.undoManager.bookmark(-2);
                     changedPaths[path].resolve();
-                    showChangeDialog();
                 }
-                
                 checkEmptyQueue();
             }
             
@@ -382,7 +383,6 @@ define(function(require, exports, module) {
                 else {
                     getLatestValue(path, function(err, path, data) {
                         updateChangedPath(err, path, data);
-                        showChangeDialog();
                     });
                 }
                 
@@ -408,7 +408,6 @@ define(function(require, exports, module) {
         
                             getLatestValue(path, function(err, path, data) {
                                 mergeChangedPath(err, path, data);
-                                showChangeDialog();
                             });
                         }