From 0a028a79a26974765e7552ce4a8afb6c1e9d62a1 Mon Sep 17 00:00:00 2001
From: Alan Knowles <alan@roojs.com>
Date: Mon, 5 Nov 2018 16:06:59 +0800
Subject: [PATCH] sync with changes

---
 GitRepo.vala | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/GitRepo.vala b/GitRepo.vala
index df1345bc..afb8ab4d 100644
--- a/GitRepo.vala
+++ b/GitRepo.vala
@@ -364,15 +364,16 @@ public class GitRepo : Object
 				  } catch(Error e) {
 				 		GitMonitor.gitmonitor.pauseError(e.message);
 				 		return false;	     	
-				
 				  }
 				  try {
 					   if (branchname != "master") {
 					       string[] cmd = { "merge", "master"  };
 						    this.git(cmd);
-			  		       cmd = { "commit",   "-a" , "-m",  "merge master changes" };
-			               this.git( cmd );
+						    this.push();
+			  		       //cmd = { "commit",   "-a" , "-m",  "merge master changes" };
+			               //git chethis.git( cmd );
 					    }
+					    
 				   } catch(Error e) {
    				   	    string[] cmd = { "checkout", "master"  };
 					    this.git(cmd);
-- 
2.39.2