From c9ac67f611650c30ef6ac3f1bf2d388fb8de063e Mon Sep 17 00:00:00 2001
From: isc-svelury <isc-svelury@users.noreply.github.com>
Date: Tue, 9 Nov 2021 13:04:35 -0500
Subject: [PATCH 01/31] Initial commit to observe merge messages

---
 .../share/git-webui/webui/js/git-webui.js      | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js
index 25b8ef98..955da6eb 100644
--- a/git-webui/release/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -109,6 +109,7 @@ webui.git = function(cmd, arg1, arg2, arg3, arg4) {
             var output = trimmedData.substring(0, messageStartIndex);
             var rcode = parseInt(footers["Git-Return-Code"]);
 
+            console.log(message, output);
             if (rcode == 0) {
                 if (callback) {
                     callback(output);
@@ -290,6 +291,7 @@ webui.SideBarView = function(mainView) {
                                     '<div class="d-grid gap-2 col-12 mx-auto">'+
                                         '<button class="btn btn-xs btn-primary btn-block btn-checkout-local-branch mt-1">Checkout Branch</button>'+
                                         '<button class="btn btn-xs btn-danger btn-block btn-delete-branch">Delete Branch</button>'+
+                                        '<button class="btn btn-xs btn-danger btn-block btn-merge-branch">Merge Branch</button>'+
                                     '</div>'+
                                 '</div>').appendTo(collapseDiv);
                 }
@@ -315,6 +317,7 @@ webui.SideBarView = function(mainView) {
                 var cardBody = $('<div class="card-body">' +
                                 '<div class="d-grid gap-2 col-12 mx-auto">'+
                                     '<button class="btn btn-xs btn-primary btn-block btn-checkout-remote-branch">Checkout Branch</button>'+
+                                    '<button class="btn btn-xs btn-danger btn-block btn-merge-remote-branch">Merge Branch</button>'+
                                 '</div>'+
                                 '</div>').appendTo(collapseDiv);
             }
@@ -1953,6 +1956,19 @@ $(function () {
         
     });
 
+    $(document).on('click', '.btn-merge-branch', function(e){
+        e.preventDefault();
+        var refName = $(this).parent().parent().parent().siblings(
+            ".card-header").children("button").html();
+
+        function logOutput (output) {
+            console.log(output);
+        }
+
+        webui.git("merge --no-commit --no-ff "+refName, logOutput);
+        webui.git("merge --abort", logOutput);
+    });
+
     $(document).on('click', '.btn-checkout-remote-branch', function(e) {
         e.preventDefault();
         var refName = $(this).parent().parent().parent().siblings(
@@ -1961,7 +1977,7 @@ $(function () {
         var remoteName = refName.split('/')[0];
         var branchName = refName.split('/')[1];
         
-        webui.git("fetch "+remoteName);
+        webui.git("fetch "+remoteName+" "+branchName);
         webui.git("checkout -b " +branchName + " " + refName, function() {
             updateSideBar();
         });

From 39ae70c5ffca41f1c1e17176f41eb556dfdb39cf Mon Sep 17 00:00:00 2001
From: isc-svelury <isc-svelury@users.noreply.github.com>
Date: Tue, 9 Nov 2021 13:45:24 -0500
Subject: [PATCH 02/31] Merge now works. Some testing and error handling
 remains.

---
 .../share/git-webui/webui/js/git-webui.js     | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js
index 955da6eb..23152b09 100644
--- a/git-webui/release/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -109,7 +109,6 @@ webui.git = function(cmd, arg1, arg2, arg3, arg4) {
             var output = trimmedData.substring(0, messageStartIndex);
             var rcode = parseInt(footers["Git-Return-Code"]);
 
-            console.log(message, output);
             if (rcode == 0) {
                 if (callback) {
                     callback(output);
@@ -1961,14 +1960,20 @@ $(function () {
         var refName = $(this).parent().parent().parent().siblings(
             ".card-header").children("button").html();
 
-        function logOutput (output) {
-            console.log(output);
+        function testMergeHandler (message) {
+            if(message.includes("Automatic merge went well")){
+                webui.git("merge "+refName);
+            }
+            else {
+                webui.showError(message);
+                function suppressErrorMessage(error) {
+                }
+                webui.git("merge --abort", "", "", suppressErrorMessage);
+            }
         }
-
-        webui.git("merge --no-commit --no-ff "+refName, logOutput);
-        webui.git("merge --abort", logOutput);
+        webui.git("merge --no-commit --no-ff "+refName, testMergeHandler, testMergeHandler, testMergeHandler);
     });
-
+        
     $(document).on('click', '.btn-checkout-remote-branch', function(e) {
         e.preventDefault();
         var refName = $(this).parent().parent().parent().siblings(

From d54a722abe32b773665c2afc2f379bb5d0c5a35f Mon Sep 17 00:00:00 2001
From: isc-svelury <isc-svelury@users.noreply.github.com>
Date: Tue, 9 Nov 2021 13:49:31 -0500
Subject: [PATCH 03/31] Banner for successful merges.

---
 git-webui/release/share/git-webui/webui/js/git-webui.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js
index 23152b09..a6bb80d5 100644
--- a/git-webui/release/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -1962,7 +1962,9 @@ $(function () {
 
         function testMergeHandler (message) {
             if(message.includes("Automatic merge went well")){
-                webui.git("merge "+refName);
+                webui.git("merge "+refName, function (output){
+                    webui.showWarning(output);
+                });
             }
             else {
                 webui.showError(message);

From f6962e3681bc88c9f99d21ea014933df4d1ed5f3 Mon Sep 17 00:00:00 2001
From: isc-svelury <isc-svelury@users.noreply.github.com>
Date: Tue, 9 Nov 2021 13:52:36 -0500
Subject: [PATCH 04/31] Fixed output for successful merge

---
 git-webui/release/share/git-webui/webui/js/git-webui.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js
index a6bb80d5..749aee61 100644
--- a/git-webui/release/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -1962,7 +1962,7 @@ $(function () {
 
         function testMergeHandler (message) {
             if(message.includes("Automatic merge went well")){
-                webui.git("merge "+refName, function (output){
+                webui.git("merge "+refName, "", "", function (output){
                     webui.showWarning(output);
                 });
             }

From d15aa7cb322c032a52313318526010ac653a1e3c Mon Sep 17 00:00:00 2001
From: isc-svelury <isc-svelury@users.noreply.github.com>
Date: Tue, 9 Nov 2021 13:54:44 -0500
Subject: [PATCH 05/31] Commit to test automatic merge message

---
 git-webui/release/share/git-webui/webui/js/git-webui.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js
index 749aee61..25f8c999 100644
--- a/git-webui/release/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -108,6 +108,7 @@ webui.git = function(cmd, arg1, arg2, arg3, arg4) {
 
             var output = trimmedData.substring(0, messageStartIndex);
             var rcode = parseInt(footers["Git-Return-Code"]);
+            console.log(output, " ---- \n", message)
 
             if (rcode == 0) {
                 if (callback) {
@@ -1962,6 +1963,7 @@ $(function () {
 
         function testMergeHandler (message) {
             if(message.includes("Automatic merge went well")){
+                console.log("Automatic merge possible")
                 webui.git("merge "+refName, "", "", function (output){
                     webui.showWarning(output);
                 });

From 01b8209c1055effa82c106f9d0d9d1a727b7cf1a Mon Sep 17 00:00:00 2001
From: isc-svelury <isc-svelury@users.noreply.github.com>
Date: Tue, 9 Nov 2021 13:56:52 -0500
Subject: [PATCH 06/31] logging commit

---
 git-webui/release/share/git-webui/webui/js/git-webui.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js
index 25f8c999..0205c5b9 100644
--- a/git-webui/release/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -1962,8 +1962,9 @@ $(function () {
             ".card-header").children("button").html();
 
         function testMergeHandler (message) {
+            console.log(message);
             if(message.includes("Automatic merge went well")){
-                console.log("Automatic merge possible")
+                console.log("Automatic merge possible");
                 webui.git("merge "+refName, "", "", function (output){
                     webui.showWarning(output);
                 });

From 67042aeebd06ba8e4eb0169cd2b523617db0621a Mon Sep 17 00:00:00 2001
From: isc-svelury <isc-svelury@users.noreply.github.com>
Date: Tue, 9 Nov 2021 14:00:56 -0500
Subject: [PATCH 07/31] Fix merge success condition

---
 git-webui/release/share/git-webui/webui/js/git-webui.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js
index 0205c5b9..1da8a10e 100644
--- a/git-webui/release/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -108,7 +108,7 @@ webui.git = function(cmd, arg1, arg2, arg3, arg4) {
 
             var output = trimmedData.substring(0, messageStartIndex);
             var rcode = parseInt(footers["Git-Return-Code"]);
-            console.log(output, " ---- \n", message)
+            // console.log(output, " ---- \n", message)
 
             if (rcode == 0) {
                 if (callback) {
@@ -1963,7 +1963,7 @@ $(function () {
 
         function testMergeHandler (message) {
             console.log(message);
-            if(message.includes("Automatic merge went well")){
+            if(message.includes("Automatic merge went well") || message.includes("Auto-merging ")){
                 console.log("Automatic merge possible");
                 webui.git("merge "+refName, "", "", function (output){
                     webui.showWarning(output);

From 8c76d8f326cd6b0fd65debf3da171de445ac01b4 Mon Sep 17 00:00:00 2001
From: isc-svelury <isc-svelury@users.noreply.github.com>
Date: Tue, 9 Nov 2021 14:16:25 -0500
Subject: [PATCH 08/31] Minor update to merge call

---
 git-webui/release/share/git-webui/webui/js/git-webui.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js
index 1da8a10e..0f0f2826 100644
--- a/git-webui/release/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -1976,7 +1976,7 @@ $(function () {
                 webui.git("merge --abort", "", "", suppressErrorMessage);
             }
         }
-        webui.git("merge --no-commit --no-ff "+refName, testMergeHandler, testMergeHandler, testMergeHandler);
+        webui.git("merge --no-commit --no-ff "+refName, testMergeHandler, "", testMergeHandler, testMergeHandler);
     });
         
     $(document).on('click', '.btn-checkout-remote-branch', function(e) {

From 45550b188aee792a5c8aea85eb4af2881d69587e Mon Sep 17 00:00:00 2001
From: isc-svelury <isc-svelury@users.noreply.github.com>
Date: Tue, 9 Nov 2021 14:16:55 -0500
Subject: [PATCH 09/31] comment to test merge

---
 git-webui/release/share/git-webui/webui/js/git-webui.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js
index 0f0f2826..a4b8da22 100644
--- a/git-webui/release/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -2000,4 +2000,6 @@ $(function () {
         e.preventDefault();
         location.reload()
     });
-});
\ No newline at end of file
+});
+
+//test comment
\ No newline at end of file

From a45b754d5f1bbdbce8d27b5ae1f068bcf625991d Mon Sep 17 00:00:00 2001
From: isc-svelury <isc-svelury@users.noreply.github.com>
Date: Tue, 9 Nov 2021 15:58:41 -0500
Subject: [PATCH 10/31] logging

---
 git-webui/release/share/git-webui/webui/js/git-webui.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js
index 0f0f2826..ade17b9e 100644
--- a/git-webui/release/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -108,7 +108,7 @@ webui.git = function(cmd, arg1, arg2, arg3, arg4) {
 
             var output = trimmedData.substring(0, messageStartIndex);
             var rcode = parseInt(footers["Git-Return-Code"]);
-            // console.log(output, " ---- \n", message)
+            console.log(output, " ---- \n", message)
 
             if (rcode == 0) {
                 if (callback) {

From ccbbe835de6d289c3543e0e52972a743692c44a6 Mon Sep 17 00:00:00 2001
From: isc-svelury <isc-svelury@users.noreply.github.com>
Date: Tue, 9 Nov 2021 16:00:04 -0500
Subject: [PATCH 11/31] commit to test merge

---
 git-webui/release/share/git-webui/webui/js/git-webui.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js
index a4b8da22..825ef414 100644
--- a/git-webui/release/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -2002,4 +2002,5 @@ $(function () {
     });
 });
 
-//test comment
\ No newline at end of file
+//test comment
+//test comment 2
\ No newline at end of file

From ce88741585853aec3270218f545bf55817ac1bf1 Mon Sep 17 00:00:00 2001
From: isc-svelury <isc-svelury@users.noreply.github.com>
Date: Tue, 9 Nov 2021 16:12:06 -0500
Subject: [PATCH 12/31] comment to test merge

---
 git-webui/release/share/git-webui/webui/js/git-webui.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js
index 17a325b4..cf7960cd 100644
--- a/git-webui/release/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -1963,7 +1963,7 @@ $(function () {
 
         function testMergeHandler (message) {
             console.log(message);
-            
+
             function suppressErrorMessage(error) {
             }
             webui.git("merge --abort", "", "", suppressErrorMessage);
@@ -2005,4 +2005,5 @@ $(function () {
 });
 
 //test comment
-//test comment 2
\ No newline at end of file
+//test comment 2
+//test comment 3
\ No newline at end of file

From 8bbf748cd39d457debdcb8501b7cd07c5f0e4bc4 Mon Sep 17 00:00:00 2001
From: isc-svelury <isc-svelury@users.noreply.github.com>
Date: Tue, 9 Nov 2021 16:17:38 -0500
Subject: [PATCH 13/31] comment to test merge

---
 git-webui/release/share/git-webui/webui/js/git-webui.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js
index cf7960cd..7bb94066 100644
--- a/git-webui/release/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -2006,4 +2006,5 @@ $(function () {
 
 //test comment
 //test comment 2
-//test comment 3
\ No newline at end of file
+//test comment 3
+//test comment 4
\ No newline at end of file

From 4df0f0bb82fac179554effcaa79d394118a0c646 Mon Sep 17 00:00:00 2001
From: isc-svelury <isc-svelury@users.noreply.github.com>
Date: Wed, 10 Nov 2021 09:41:59 -0500
Subject: [PATCH 14/31] Fix success handler for test merge

---
 git-webui/release/share/git-webui/webui/js/git-webui.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js
index 7bb94066..50eaef5c 100644
--- a/git-webui/release/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -1971,6 +1971,7 @@ $(function () {
             if(message.includes("Automatic merge went well") || message.includes("Auto-merging ")){
                 console.log("Automatic merge possible");
                 webui.git("merge "+refName, "", "", function (output){
+                    console.log("Actual merge outpot: ", output)
                     webui.showWarning(output);
                 });
             }
@@ -1978,7 +1979,7 @@ $(function () {
                 webui.showError(message);
             }
         }
-        webui.git("merge --no-commit --no-ff "+refName, testMergeHandler, "", testMergeHandler, testMergeHandler);
+        webui.git("merge --no-commit --no-ff "+refName, "", "", testMergeHandler, testMergeHandler);
     });
         
     $(document).on('click', '.btn-checkout-remote-branch', function(e) {

From f53cad10cdde50a0c0f030e14277a077953f10e7 Mon Sep 17 00:00:00 2001
From: isc-svelury <isc-svelury@users.noreply.github.com>
Date: Wed, 10 Nov 2021 09:42:46 -0500
Subject: [PATCH 15/31] Comment to test merge

---
 git-webui/release/share/git-webui/webui/js/git-webui.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js
index 50eaef5c..31de51dc 100644
--- a/git-webui/release/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -2008,4 +2008,5 @@ $(function () {
 //test comment
 //test comment 2
 //test comment 3
-//test comment 4
\ No newline at end of file
+//test comment 4
+//test comment 5
\ No newline at end of file

From bec0e5fdfb211069ddfe28ead48206d4478bd083 Mon Sep 17 00:00:00 2001
From: isc-svelury <isc-svelury@users.noreply.github.com>
Date: Wed, 10 Nov 2021 09:44:48 -0500
Subject: [PATCH 16/31] Fix handler for successful merge

---
 git-webui/release/share/git-webui/webui/js/git-webui.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js
index 31de51dc..22d8b1b9 100644
--- a/git-webui/release/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -1970,7 +1970,7 @@ $(function () {
 
             if(message.includes("Automatic merge went well") || message.includes("Auto-merging ")){
                 console.log("Automatic merge possible");
-                webui.git("merge "+refName, "", "", function (output){
+                webui.git("merge "+refName, function (output){
                     console.log("Actual merge outpot: ", output)
                     webui.showWarning(output);
                 });

From 0c6d53b0033090273f7e52d97edc738fb9745b4b Mon Sep 17 00:00:00 2001
From: isc-svelury <isc-svelury@users.noreply.github.com>
Date: Wed, 10 Nov 2021 09:45:24 -0500
Subject: [PATCH 17/31] Comment to test merge

---
 git-webui/release/share/git-webui/webui/js/git-webui.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js
index 22d8b1b9..53dbce19 100644
--- a/git-webui/release/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -2009,4 +2009,5 @@ $(function () {
 //test comment 2
 //test comment 3
 //test comment 4
-//test comment 5
\ No newline at end of file
+//test comment 5
+//test comment 6
\ No newline at end of file

From b3b5e0eaf5719019e842c339663ce7b20089a5ba Mon Sep 17 00:00:00 2001
From: isc-svelury <isc-svelury@users.noreply.github.com>
Date: Wed, 10 Nov 2021 09:56:01 -0500
Subject: [PATCH 18/31] Better logging

---
 git-webui/release/share/git-webui/webui/js/git-webui.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js
index 53dbce19..d31ee934 100644
--- a/git-webui/release/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -108,7 +108,7 @@ webui.git = function(cmd, arg1, arg2, arg3, arg4) {
 
             var output = trimmedData.substring(0, messageStartIndex);
             var rcode = parseInt(footers["Git-Return-Code"]);
-            console.log(output, " ---- \n", message)
+            console.log(cmd, "------ \n",output, " ---- \n", message)
 
             if (rcode == 0) {
                 if (callback) {

From d17c871bf3f33149860608f2f91ad97a19d9e527 Mon Sep 17 00:00:00 2001
From: isc-svelury <isc-svelury@users.noreply.github.com>
Date: Wed, 10 Nov 2021 09:56:30 -0500
Subject: [PATCH 19/31] Comment to test merge

---
 git-webui/release/share/git-webui/webui/js/git-webui.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js
index 53dbce19..9a3668a7 100644
--- a/git-webui/release/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -2010,4 +2010,5 @@ $(function () {
 //test comment 3
 //test comment 4
 //test comment 5
-//test comment 6
\ No newline at end of file
+//test comment 6
+//test comment 7
\ No newline at end of file

From 35593a03030e6304b3edd41bcc02565a3ff2f899 Mon Sep 17 00:00:00 2001
From: isc-svelury <isc-svelury@users.noreply.github.com>
Date: Wed, 10 Nov 2021 09:57:39 -0500
Subject: [PATCH 20/31] Comment to test merge

---
 git-webui/release/share/git-webui/webui/js/git-webui.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js
index 9a3668a7..a8336b02 100644
--- a/git-webui/release/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -2011,4 +2011,5 @@ $(function () {
 //test comment 4
 //test comment 5
 //test comment 6
-//test comment 7
\ No newline at end of file
+//test comment 7
+//test comment 8
\ No newline at end of file

From 9600cbdb9e9be0de4fe7f6c2ffe61da3305eb478 Mon Sep 17 00:00:00 2001
From: isc-svelury <isc-svelury@users.noreply.github.com>
Date: Wed, 10 Nov 2021 09:58:54 -0500
Subject: [PATCH 21/31] Commenting for merge conflict

---
 git-webui/release/share/git-webui/webui/js/git-webui.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js
index 427d951b..8d315154 100644
--- a/git-webui/release/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -2012,4 +2012,5 @@ $(function () {
 //test comment 5
 //test comment 6
 //test comment 7
+//test comment 8
 //test comment 8
\ No newline at end of file

From ba504568cd2297f3cf748a6f6ffd6d84d7d8fdaa Mon Sep 17 00:00:00 2001
From: isc-svelury <isc-svelury@users.noreply.github.com>
Date: Wed, 10 Nov 2021 12:29:38 -0500
Subject: [PATCH 22/31] Error handling for cases when git returns the error
 message as a part of the request output instead of the message section.

---
 .../share/git-webui/webui/js/git-webui.js     | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js
index 8d315154..3aee8690 100644
--- a/git-webui/release/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -123,10 +123,21 @@ webui.git = function(cmd, arg1, arg2, arg3, arg4) {
                     }
                 }
             } else {
-                if(errorCallback) {
-                    errorCallback(message);
-                } else{
-                    webui.showError(message);
+                var displayMessage = ""
+                if(output.length > 0){
+                    displayMessage += (output+"\n");
+                }
+                if(message.length > 0){
+                    displayMessage += message;
+                }
+                if(displayMessage.length > 0){
+                    if(errorCallback) {
+                        errorCallback(displayMessage);
+                    } else{
+                        webui.showError(displayMessage);
+                    }
+                } else {
+                    webui.showError("The command <pre>"+cmd+"</pre> failed because of an unknown reason. Returned response: \n"+data)
                 }
             }
         } else {

From fe05e1fbdfedd78403bb3a343694635d74db7640 Mon Sep 17 00:00:00 2001
From: isc-svelury <isc-svelury@users.noreply.github.com>
Date: Wed, 10 Nov 2021 12:39:59 -0500
Subject: [PATCH 23/31] Comment to test merge

---
 git-webui/release/share/git-webui/webui/js/git-webui.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js
index 3aee8690..7eacf9c3 100644
--- a/git-webui/release/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -2024,4 +2024,5 @@ $(function () {
 //test comment 6
 //test comment 7
 //test comment 8
-//test comment 8
\ No newline at end of file
+//test comment 9
+//test comment 10
\ No newline at end of file

From a17c0684fa289108e7b757fdf3c96bad3c604d59 Mon Sep 17 00:00:00 2001
From: isc-svelury <isc-svelury@users.noreply.github.com>
Date: Wed, 10 Nov 2021 12:40:41 -0500
Subject: [PATCH 24/31] comment to test merge conflict

---
 git-webui/release/share/git-webui/webui/js/git-webui.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js
index 7eacf9c3..b34c715a 100644
--- a/git-webui/release/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -2025,4 +2025,5 @@ $(function () {
 //test comment 7
 //test comment 8
 //test comment 9
-//test comment 10
\ No newline at end of file
+//test comment 10
+//test comment 11
\ No newline at end of file

From d5e7d041520fd5f0cb424ea24f23fd4a3f03507f Mon Sep 17 00:00:00 2001
From: isc-svelury <isc-svelury@users.noreply.github.com>
Date: Wed, 10 Nov 2021 12:43:17 -0500
Subject: [PATCH 25/31] comment for merge conflict

---
 git-webui/release/share/git-webui/webui/js/git-webui.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js
index 7eacf9c3..9ed80091 100644
--- a/git-webui/release/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -2025,4 +2025,5 @@ $(function () {
 //test comment 7
 //test comment 8
 //test comment 9
+//test comment 10
 //test comment 10
\ No newline at end of file

From 372b192019c74724e25534c586e0ee510aed4e31 Mon Sep 17 00:00:00 2001
From: isc-svelury <isc-svelury@users.noreply.github.com>
Date: Wed, 10 Nov 2021 12:46:31 -0500
Subject: [PATCH 26/31] Comment to test merge

---
 git-webui/release/share/git-webui/webui/js/git-webui.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js
index b34c715a..fbac72ad 100644
--- a/git-webui/release/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -2026,4 +2026,5 @@ $(function () {
 //test comment 8
 //test comment 9
 //test comment 10
-//test comment 11
\ No newline at end of file
+//test comment 11
+//test comment 12
\ No newline at end of file

From 1d6fa3f4fcd4370ea37c73f198b9b3a8d772e1bd Mon Sep 17 00:00:00 2001
From: isc-svelury <isc-svelury@users.noreply.github.com>
Date: Wed, 10 Nov 2021 13:16:28 -0500
Subject: [PATCH 27/31] Cleanup   merging remote branch

---
 .../share/git-webui/webui/js/git-webui.js     | 66 ++++++++++++-------
 1 file changed, 44 insertions(+), 22 deletions(-)

diff --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js
index fbac72ad..a781423d 100644
--- a/git-webui/release/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -37,6 +37,19 @@ webui.COLORS = ["#ffab1d", "#fd8c25", "#f36e4a", "#fc6148", "#d75ab6", "#b25ade"
                 "#e47b07", "#e36920", "#d34e2a", "#ec3b24", "#ba3d99", "#9d45c9", "#4f5aec", "#615dcf", "#3286cf", "#00abca", "#279227", "#3a980c", "#6c7f00", "#ab8b0a", "#b56427", "#757575",
                 "#ff911a", "#fc8120", "#e7623e", "#fa5236", "#ca4da9", "#a74fd3", "#5a68ff", "#6d69db", "#489bd9", "#00bcde", "#36a436", "#47a519", "#798d0a", "#c1a120", "#bf7730", "#8e8e8e"]
 
+webui.showSuccess = function(message) {
+    var messageBox = $("#message-box");
+    messageBox.empty();
+    $(  '<div class="alert alert-success alert-dismissible" role="alert">' +
+            '<button type="button" class="btn btn-default close" data-dismiss="alert">' +
+            '<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-x-lg" viewBox="0 0 16 16">'+
+            '<path fill-rule="evenodd" clip-rule="evenodd" d="M13.854 2.146a.5.5 0 0 1 0 .708l-11 11a.5.5 0 0 1-.708-.708l11-11a.5.5 0 0 1 .708 0Z" fill="#000"/>'+
+            '<path fill-rule="evenodd" clip-rule="evenodd" d="M2.146 2.146a.5.5 0 0 0 0 .708l11 11a.5.5 0 0 0 .708-.708l-11-11a.5.5 0 0 0-.708 0Z" fill="#000"/>'+
+            '</svg>'+
+            '</button>' +
+            message +
+        '</div>').appendTo(messageBox);
+}
 
 webui.showError = function(message) {
     $("#error-modal .alert").text(message);
@@ -108,7 +121,6 @@ webui.git = function(cmd, arg1, arg2, arg3, arg4) {
 
             var output = trimmedData.substring(0, messageStartIndex);
             var rcode = parseInt(footers["Git-Return-Code"]);
-            console.log(cmd, "------ \n",output, " ---- \n", message)
 
             if (rcode == 0) {
                 if (callback) {
@@ -137,7 +149,7 @@ webui.git = function(cmd, arg1, arg2, arg3, arg4) {
                         webui.showError(displayMessage);
                     }
                 } else {
-                    webui.showError("The command <pre>"+cmd+"</pre> failed because of an unknown reason. Returned response: \n"+data)
+                    webui.showError("The command <pre>"+cmd+"</pre> failed because of an unknown reason. Returned response: \n\n"+data)
                 }
             }
         } else {
@@ -301,8 +313,8 @@ webui.SideBarView = function(mainView) {
                     var cardBody = $('<div class="card-body">' +
                                     '<div class="d-grid gap-2 col-12 mx-auto">'+
                                         '<button class="btn btn-xs btn-primary btn-block btn-checkout-local-branch mt-1">Checkout Branch</button>'+
+                                        '<button class="btn btn-xs btn-warning btn-block btn-merge-branch">Merge Branch</button>'+
                                         '<button class="btn btn-xs btn-danger btn-block btn-delete-branch">Delete Branch</button>'+
-                                        '<button class="btn btn-xs btn-danger btn-block btn-merge-branch">Merge Branch</button>'+
                                     '</div>'+
                                 '</div>').appendTo(collapseDiv);
                 }
@@ -328,7 +340,7 @@ webui.SideBarView = function(mainView) {
                 var cardBody = $('<div class="card-body">' +
                                 '<div class="d-grid gap-2 col-12 mx-auto">'+
                                     '<button class="btn btn-xs btn-primary btn-block btn-checkout-remote-branch">Checkout Branch</button>'+
-                                    '<button class="btn btn-xs btn-danger btn-block btn-merge-remote-branch">Merge Branch</button>'+
+                                    '<button class="btn btn-xs btn-warning btn-block btn-merge-remote-branch">Merge Branch</button>'+
                                 '</div>'+
                                 '</div>').appendTo(collapseDiv);
             }
@@ -1973,17 +1985,40 @@ $(function () {
             ".card-header").children("button").html();
 
         function testMergeHandler (message) {
-            console.log(message);
+            function suppressErrorMessage(error) {
+            }
+            webui.git("merge --abort", "", "", suppressErrorMessage);
 
+            if(message.includes("Automatic merge went well") || message.includes("Auto-merging ")){
+                webui.git("merge "+refName, function (output){
+                    webui.showSuccess(output);
+                });
+            }
+            else {
+                webui.showError(message);
+            }
+        }
+        webui.git("merge --no-commit --no-ff "+refName, "", "", testMergeHandler, testMergeHandler);
+    });
+
+    $(document).on('click', '.btn-merge-remote-branch', function(e){
+        e.preventDefault();
+        var refName = $(this).parent().parent().parent().siblings(
+            ".card-header").children("button").html();
+
+        var remoteName = refName.split('/')[0];
+        var branchName = refName.split('/')[1];
+        
+        webui.git("fetch "+remoteName+" "+branchName);
+
+        function testMergeHandler (message) {
             function suppressErrorMessage(error) {
             }
             webui.git("merge --abort", "", "", suppressErrorMessage);
 
             if(message.includes("Automatic merge went well") || message.includes("Auto-merging ")){
-                console.log("Automatic merge possible");
                 webui.git("merge "+refName, function (output){
-                    console.log("Actual merge outpot: ", output)
-                    webui.showWarning(output);
+                    webui.showSuccess(output);
                 });
             }
             else {
@@ -2014,17 +2049,4 @@ $(function () {
         e.preventDefault();
         location.reload()
     });
-});
-
-//test comment
-//test comment 2
-//test comment 3
-//test comment 4
-//test comment 5
-//test comment 6
-//test comment 7
-//test comment 8
-//test comment 9
-//test comment 10
-//test comment 11
-//test comment 12
\ No newline at end of file
+});
\ No newline at end of file

From e86100fb0eb65288506e613ad9e3bd995f2bb585 Mon Sep 17 00:00:00 2001
From: isc-svelury <isc-svelury@users.noreply.github.com>
Date: Wed, 10 Nov 2021 13:21:09 -0500
Subject: [PATCH 28/31] comment to test local merge

---
 git-webui/release/share/git-webui/webui/js/git-webui.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js
index a781423d..be55c394 100644
--- a/git-webui/release/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -2049,4 +2049,6 @@ $(function () {
         e.preventDefault();
         location.reload()
     });
-});
\ No newline at end of file
+});
+
+//test comment
\ No newline at end of file

From bf8280f1cb1802912413ba37e9d32c82a929bfff Mon Sep 17 00:00:00 2001
From: isc-svelury <91484958+isc-svelury@users.noreply.github.com>
Date: Wed, 10 Nov 2021 14:21:06 -0500
Subject: [PATCH 29/31] comment to test remote merge

---
 git-webui/release/share/git-webui/webui/js/git-webui.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js
index be55c394..2139da8d 100644
--- a/git-webui/release/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -2051,4 +2051,5 @@ $(function () {
     });
 });
 
-//test comment
\ No newline at end of file
+//test comment
+//test comment 2

From 572ec8556a55437ef9b6bbbae5b5f69f75a2b0d2 Mon Sep 17 00:00:00 2001
From: Sarmishta Velury <isc-svelury@users.noreply.github.com>
Date: Wed, 10 Nov 2021 14:30:46 -0500
Subject: [PATCH 30/31] Comment to test remote merge conflict

---
 git-webui/release/share/git-webui/webui/js/git-webui.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js
index 2139da8d..df283cb9 100644
--- a/git-webui/release/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -2053,3 +2053,4 @@ $(function () {
 
 //test comment
 //test comment 2
+//test comment 2

From 294a50951dd6ee69f79564247ce5243cf9bfc1af Mon Sep 17 00:00:00 2001
From: isc-svelury <91484958+isc-svelury@users.noreply.github.com>
Date: Wed, 10 Nov 2021 14:39:29 -0500
Subject: [PATCH 31/31] Comment to test remote merge conflict

---
 git-webui/release/share/git-webui/webui/js/git-webui.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js
index 2139da8d..bcfc83df 100644
--- a/git-webui/release/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -2053,3 +2053,4 @@ $(function () {
 
 //test comment
 //test comment 2
+//test comment 3