From 4ebe160f6c050b1c3b32f5cea2ac360ae5903b1c Mon Sep 17 00:00:00 2001
From: Gerwin van Beek <gvanbeek@optimizers.nl>
Date: Tue, 28 Sep 2021 17:19:22 +0200
Subject: [PATCH] Restore tab selection after merging conflicts

---
 packages/node_modules/@node-red/editor-client/src/js/ui/diff.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js b/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js
index a039e0172..1e7842e18 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js
@@ -1376,6 +1376,7 @@ RED.diff = (function() {
 
     function mergeDiff(diff) {
         //console.log(diff);
+        var selected = RED.workspaces.active();
         var appliedDiff = applyDiff(diff);
 
         var newConfig = appliedDiff.config;
@@ -1426,6 +1427,7 @@ RED.diff = (function() {
         RED.view.redraw(true);
         RED.palette.refresh();
         RED.workspaces.refresh();
+        RED.workspaces.show(selected, true);
         RED.sidebar.config.refresh();
     }