- 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;
+