sync

diff --git a/GitRepo.vala b/GitRepo.vala
index 1916311..9e19695 100644 (file)
--- a/GitRepo.vala
+++ b/GitRepo.vala
@@ -32,7 +32,7 @@ public class GitRepo : Object
         }
         return _GitRepo;
     }
-
+ 
     /**
     * index of.. matching gitpath..
     */
@@ -347,7 +347,6 @@ public class GitRepo : Object
        return true;
     }
     
-    
     public bool createBranchNamed(string branchname)
     {  
                
@@ -371,20 +370,20 @@ public class GitRepo : Object
                                
                                  }
                                  try {
-                                    string[] cmd = { "merge", "master"  };
+                                      string[] cmd = { "merge", "master"  };
                                            this.git(cmd);
                                   } catch(Error e) {
-                                               try {
-                                                   string[] cmd = { "mergetool" , "--no-prompt" }; 
-                                                       this.git(cmd);
-                                                   cmd = { "commit",  "-m" , "Fix merge conflicts from master" };
-                                                       this.git(cmd);
-                                               } catch(Error ee) {
-                                                       GitMonitor.gitmonitor.pauseError(ee.message);
-                                                       return false;           
-                                               }
+                                           string[] cmd = { "checkout", "master"  };
+                                           this.git(cmd);
+                                               GitMonitor.gitmonitor.pauseError(
+                                                       "Use\n\na) git checkout %s\nb) git mergetool\nc) git commit\nd) git push\n d) stash pop \ne) start gitlive again\n".printf(
+                                                               branchname)
+                                                        + e.message
+                                               );
+                                               return false;           
+                                        
                                        }
-                                 try {                                 
+                                  try {                                        
                                           string[]  cmd = { "stash", "pop"  };
                                            if (stash) { this.git(cmd); }
                                        } catch(Error ee) {
@@ -416,8 +415,7 @@ public class GitRepo : Object
                notification.set_timeout(5);
                notification.show();   
        
-                   
-           
+        
         this.loadBranches(); // update branch list...
         GitMonitor.gitmonitor.runQueue(); // commit any outstanding...
         return true;