diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2019-03-02 20:56:54 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2019-03-02 21:31:48 +1100 |
| commit | 790235f64bafa315572fb3d32580ac8e068f98a1 (patch) | |
| tree | de4a79df7ef01baa0ae6bcaf01efa3f8c2237731 | |
| parent | abc0f7f0aa8966e9e046a4b177464f75f95afc99 (diff) | |
add another match on the error message to tell us we've encountered merge conflicts
| -rw-r--r-- | pkg/gui/rebase_options_panel.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/gui/rebase_options_panel.go b/pkg/gui/rebase_options_panel.go index 1c3c98518..337d81692 100644 --- a/pkg/gui/rebase_options_panel.go +++ b/pkg/gui/rebase_options_panel.go @@ -77,7 +77,7 @@ 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(), "When you have resolved this problem") || strings.Contains(result.Error(), "fix conflicts") { + } 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 { return nil |