Let conflict resolution restore deleted childnodes if force_local

2026-05-15 21:48:20 +02:00 · 2015-06-18 11:48:49 -04:00
parent ee6479ff48
commit ca47d2662d
1 changed files with 1 additions and 1 deletions
@@ -95,7 +95,7 @@ iD.actions.MergeRemoteChanges = function(id, localGraph, remoteGraph, formatUser

            } else if (option === 'force_local' && local) {
                target = iD.Entity(local);
-                if (remote && remote.visible) {
+                if (remote) {
                    target = target.update({ version: remote.version });
                }
                updates.replacements.push(target);