handling of old branches

diff --git a/GitRepo.vala b/GitRepo.vala
index 77a56f2..1916311 100644 (file)
--- a/GitRepo.vala
+++ b/GitRepo.vala
@@ -347,6 +347,7 @@ public class GitRepo : Object
        return true;
     }
     
+    
     public bool createBranchNamed(string branchname)
     {  
                
@@ -374,7 +375,7 @@ public class GitRepo : Object
                                            this.git(cmd);
                                   } catch(Error e) {
                                                try {
-                                                   string[] cmd = { "mergetool" };
+                                                   string[] cmd = { "mergetool" , "--no-prompt" }; 
                                                        this.git(cmd);
                                                    cmd = { "commit",  "-m" , "Fix merge conflicts from master" };
                                                        this.git(cmd);
@@ -398,7 +399,7 @@ public class GitRepo : Object
                                        string[] cmd = { "checkout", "-b" , branchname  };
                                        this.git(cmd);
                                        
-                       this.push();                                    
+                       this.push();    
                                        } catch(Error ee) {
                                                GitMonitor.gitmonitor.pauseError(ee.message);
                                                return false;