From 563728c7b8e40c7da79e9570f502ae60217857cd Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 20 Dec 2016 21:13:39 +0000
Subject: [PATCH] Some more merging code

---
 editor/js/ui/diff.js | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/editor/js/ui/diff.js b/editor/js/ui/diff.js
index d1a01518c..198ac300e 100644
--- a/editor/js/ui/diff.js
+++ b/editor/js/ui/diff.js
@@ -1187,24 +1187,35 @@ RED.diff = (function() {
             }
         });
         toMerge.forEach(function(newNode) {
+            var currentNode;
             console.log("merging node",newNode.id);
             if (newNode.type !== 'tab' && newNode.type !== 'subflow') {
-                var currentNode = RED.nodes.node(newNode.id);
+                currentNode = RED.nodes.node(newNode.id);
                 var def = RED.nodes.getType(currentNode.type);
-                currentNode.x = newNode.x;
-                currentNode.y = newNode.y;
+                if (currentNode.hasOwnProperty('x')) {
+                    currentNode.x = newNode.x;
+                    currentNode.y = newNode.y;
+                }
                 for (var d in def.defaults) {
                     if (def.defaults.hasOwnProperty(d)) {
                         currentNode[d] = newNode[d];
                     }
                 }
+                var removedLinks = RED.editor.updateNodeProperties(currentNode);
+                if (removedLinks.length > 0) {
+                    removed.push({links:removedLinks});
+                }
+            } else if (newNode.type === 'tab') {
+                currentNode = RED.nodes.workspace(newNode.id);
+                currentNode.label = newNode.label;
             }
-
-
         })
 
 
         RED.view.redraw(true);
+        RED.palette.refresh();
+        RED.workspaces.refresh();
+        RED.sidebar.config.refresh();
 
     }
     return {