Only check childnode versions of nodes that exist both locally and remote

The old code was causing false positives, flagging any added or removed
childnode as a conflict.
This commit is contained in:
Bryan Housel
2015-04-27 22:49:27 -04:00
parent 09012c00dc
commit d85e6c260e
+1 -1
View File
@@ -85,7 +85,7 @@ iD.modes.Save = function(context) {
var a = localGraph.hasEntity(children[i]),
b = remoteGraph.hasEntity(children[i]);
if (!a || !b || a.version !== b.version) return false;
if (a && b && a.version !== b.version) return false;
}
}