diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2019-02-16 21:30:29 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2019-02-16 21:30:29 +1100 |
| commit | cb372d469fd5d50fff919f49c2fd539dfb874ee8 (patch) | |
| tree | 89505cabaff0a1951519cf9fa76cf910222cb990 /pkg/gui/rebase_options_panel.go | |
| parent | 88ba6efdd5fbac6eb2313f2472f83bde3203c936 (diff) | |
fix golangci errors
Diffstat (limited to 'pkg/gui/rebase_options_panel.go')
| -rw-r--r-- | pkg/gui/rebase_options_panel.go | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/pkg/gui/rebase_options_panel.go b/pkg/gui/rebase_options_panel.go index 11afbbeca..1c3c98518 100644 --- a/pkg/gui/rebase_options_panel.go +++ b/pkg/gui/rebase_options_panel.go @@ -52,7 +52,6 @@ func (gui *Gui) genericMergeCommand(command string) error { // we should end up with a command like 'git merge --continue' // it's impossible for a rebase to require a commit so we'll use a subprocess only if it's a merge - // TODO: find a way to make the commit automatic if status == "merging" && command != "abort" && gui.Config.GetUserConfig().GetBool("git.merging.manualCommit") { sub := gui.OSCommand.PrepareSubProcess("git", commandType, fmt.Sprintf("--%s", command)) if sub != nil { @@ -79,7 +78,6 @@ func (gui *Gui) handleGenericMergeCommandResult(result error) error { } else if strings.Contains(result.Error(), "No changes - did you forget to use") { return gui.genericMergeCommand("skip") } else if strings.Contains(result.Error(), "When you have resolved this problem") || strings.Contains(result.Error(), "fix conflicts") { - // TODO: generalise this title to support merging and rebasing return gui.createConfirmationPanel(gui.g, gui.getFilesView(), gui.Tr.SLocalize("FoundConflictsTitle"), gui.Tr.SLocalize("FoundConflicts"), func(g *gocui.Gui, v *gocui.View) error { return nil |