sync with changes
authorAlan Knowles <alan@roojs.com>
Mon, 5 Nov 2018 08:06:59 +0000 (16:06 +0800)
committerAlan Knowles <alan@roojs.com>
Mon, 5 Nov 2018 08:06:59 +0000 (16:06 +0800)
GitRepo.vala

index df1345b..afb8ab4 100644 (file)
@@ -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);