diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2019-11-05 13:02:04 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2019-11-05 19:22:01 +1100 |
| commit | 234415537943c090a3f9c3fa3ad7889b6998f9d2 (patch) | |
| tree | 77f1f3a1ea4158f1f38cc9b893a11942573357cf | |
| parent | 48347d4d8687bd15244637053851643dfa973753 (diff) | |
handle empty commit in rebase
| -rw-r--r-- | pkg/gui/rebase_options_panel.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkg/gui/rebase_options_panel.go b/pkg/gui/rebase_options_panel.go index 633574275..41f0070c3 100644 --- a/pkg/gui/rebase_options_panel.go +++ b/pkg/gui/rebase_options_panel.go @@ -77,6 +77,8 @@ func (gui *Gui) handleGenericMergeCommandResult(result error) error { return result } else if strings.Contains(result.Error(), "No changes - did you forget to use") { 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(), "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(), gui.Tr.SLocalize("FoundConflictsTitle"), gui.Tr.SLocalize("FoundConflicts"), func(g *gocui.Gui, v *gocui.View) error { |