sync with changes

[gitlive] / GitRepo.vala

diff --git a/GitRepo.vala b/GitRepo.vala
index dafecc6..afb8ab4 100644 (file)
--- a/GitRepo.vala
+++ b/GitRepo.vala
@@ -247,9 +247,7 @@ public class GitRepo : Object
        }
        GitMonitor.gitmonitor.start();
     }
-    
-
-
+     
 
     public bool doMerge(string action, string ticket_id, string commit_message)
     {
@@ -366,13 +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);
+                                                   this.push();
+                                              //cmd = { "commit",   "-a" , "-m",  "merge master changes" };
+                                      //git chethis.git( cmd );
                                            }
+                                           
                                   } catch(Error e) {
                                            string[] cmd = { "checkout", "master"  };
                                            this.git(cmd);