diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-03-28 12:52:45 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-03-28 13:19:35 +1100 |
| commit | 517b7d02839ab87693f19ea571b8bd29f07fd00e (patch) | |
| tree | 7ecdba06d030bcf8473c684b4fdd7a4a5c19875c /pkg/gui/rebase_options_panel.go | |
| parent | 0c0231c3e835ef93a7fe06a95c28bd00f1da6631 (diff) | |
fix up some things with the patch handling stuff
Diffstat (limited to 'pkg/gui/rebase_options_panel.go')
| -rw-r--r-- | pkg/gui/rebase_options_panel.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkg/gui/rebase_options_panel.go b/pkg/gui/rebase_options_panel.go index 233f77e64..d34733591 100644 --- a/pkg/gui/rebase_options_panel.go +++ b/pkg/gui/rebase_options_panel.go @@ -74,6 +74,9 @@ func (gui *Gui) handleGenericMergeCommandResult(result error) error { return gui.genericMergeCommand("skip") } else if strings.Contains(result.Error(), "The previous cherry-pick is now empty") { return gui.genericMergeCommand("continue") + } else if strings.Contains(result.Error(), "No rebase in progress?") { + // assume in this case that we're already done + return nil } else if strings.Contains(result.Error(), "When you have resolved this problem") || strings.Contains(result.Error(), "fix conflicts") || strings.Contains(result.Error(), "Resolve all conflicts manually") { return gui.createConfirmationPanel(gui.g, gui.getFilesView(), true, gui.Tr.SLocalize("FoundConflictsTitle"), gui.Tr.SLocalize("FoundConflicts"), func(g *gocui.Gui, v *gocui.View) error { |