diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2019-02-16 12:07:27 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2019-02-16 12:07:27 +1100 |
| commit | 198cbee498e9201b1f12514f909eb3da98db5ec7 (patch) | |
| tree | a315ad46dd3b170ce3e9c3a826853affe97d5d93 /pkg/gui/branches_panel.go | |
| parent | daca07eacac8bc5cb7bcf65a762ed5093f2b8a82 (diff) | |
introduce panel contexts and more work on rebasing
Diffstat (limited to 'pkg/gui/branches_panel.go')
| -rw-r--r-- | pkg/gui/branches_panel.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkg/gui/branches_panel.go b/pkg/gui/branches_panel.go index 6fc6d192c..54f7de305 100644 --- a/pkg/gui/branches_panel.go +++ b/pkg/gui/branches_panel.go @@ -112,6 +112,10 @@ func (gui *Gui) handleRebase(g *gocui.Gui, v *gocui.View) error { } if err := gui.GitCommand.RebaseBranch(selectedBranch); err != nil { + if !strings.Contains(err.Error(), "When you have resolved this problem") { + return gui.createErrorPanel(gui.g, err.Error()) + } + if err := gui.refreshSidePanels(g); err != nil { return err } |