/// <summary> /// Edit merge commit description /// </summary> private void MenuEditCommitMergeClick(object sender, EventArgs e) { try { ClassCommit c = GetMergeCommitBundle(); FormCommitMerge commitMerge = new FormCommitMerge(false, c.Description); commitMerge.SetFiles(c); if (commitMerge.ShowDialog() == DialogResult.OK) { // Overwrite default merge message file with our updated text File.WriteAllText(status.pathToMergeMsg, commitMerge.GetDescription()); App.DoRefresh(); } } catch (Exception ex) { App.PrintStatusMessage(ex.Message, MessageType.Error); } }
/// <summary> /// Submit merge /// </summary> private void MenuSubmitMergeClick(object sender, EventArgs e) { try { ClassCommit c = GetMergeCommitBundle(); FormCommitMerge commitMerge = new FormCommitMerge(true, c.Description); commitMerge.SetFiles(c); if (commitMerge.ShowDialog() == DialogResult.OK) { if (status.Repo.GitCommit("-F \"" + status.pathToMergeMsg + "\"", false, new List <string>())) { App.DoRefresh(); } } } catch (Exception ex) { App.PrintStatusMessage(ex.Message, MessageType.Error); } }
/// <summary> /// Submit merge /// </summary> private void MenuSubmitMergeClick(object sender, EventArgs e) { try { ClassCommit c = GetMergeCommitBundle(); FormCommitMerge commitMerge = new FormCommitMerge(true, c.Description); commitMerge.SetFiles(c); if (commitMerge.ShowDialog() == DialogResult.OK) { if (status.Repo.GitCommit("-F \"" + status.pathToMergeMsg + "\"", false, new List<string>())) { App.DoRefresh(); } } } catch (Exception ex) { App.PrintStatusMessage(ex.Message, MessageType.Error); } }