diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2018-12-11 22:16:48 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2018-12-11 22:16:48 +1100 |
| commit | a3656154906c1117f9c9bbe100aa585e43417897 (patch) | |
| tree | 6247c687bde83aa32ccb79fb6e341189fb2116af /pkg/gui/branches_panel.go | |
| parent | 9489a9447396b30bca86ea3df201cacfdffdb1a9 (diff) | |
only use subprocess for merging, not rebasing
Diffstat (limited to 'pkg/gui/branches_panel.go')
| -rw-r--r-- | pkg/gui/branches_panel.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkg/gui/branches_panel.go b/pkg/gui/branches_panel.go index 82a850e9d..b94c91e28 100644 --- a/pkg/gui/branches_panel.go +++ b/pkg/gui/branches_panel.go @@ -112,9 +112,12 @@ func (gui *Gui) handleRebase(g *gocui.Gui, v *gocui.View) error { } if err := gui.GitCommand.RebaseBranch(selectedBranch); err != nil { + if err := gui.refreshSidePanels(g); err != nil { + return err + } return gui.createConfirmationPanel(g, v, "Auto-rebase failed", gui.Tr.SLocalize("FoundConflicts"), func(g *gocui.Gui, v *gocui.View) error { - return nil + return gui.refreshSidePanels(g) }, func(g *gocui.Gui, v *gocui.View) error { if err := gui.GitCommand.AbortRebaseBranch(); err != nil { return err |