From d85e6c260e3456d0a8d4ed708abd0941f740a616 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@7thposition.com>
Date: Mon, 27 Apr 2015 22:49:27 -0400
Subject: [PATCH] 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.
---
 js/id/modes/save.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/id/modes/save.js b/js/id/modes/save.js
index ce8df98a2..58ef0dfea 100644
--- a/js/id/modes/save.js
+++ b/js/id/modes/save.js
@@ -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;
                     }
                 }