return true;
}
+
public bool createBranchNamed(string branchname)
{
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);
string[] cmd = { "checkout", "-b" , branchname };
this.git(cmd);
- this.push();
+ this.push();
} catch(Error ee) {
GitMonitor.gitmonitor.pauseError(ee.message);
return false;