diff options
| author | Glenn Vriesman <glenn.vriesman@gmail.com> | 2018-12-02 17:47:42 +0100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2018-12-11 09:39:54 +1100 |
| commit | cce6f405a5643ed46a6bc0b9fd7cf132c915c9f3 (patch) | |
| tree | 1d09d1ad257ab08291163dcfcf0364c151e7026e /pkg/gui/merge_panel.go | |
| parent | e39d2ed44bc8cc187abe3cd59349c40ca126b7a6 (diff) | |
Making ci happier
Diffstat (limited to 'pkg/gui/merge_panel.go')
| -rw-r--r-- | pkg/gui/merge_panel.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkg/gui/merge_panel.go b/pkg/gui/merge_panel.go index 1a4a25816..7c2922c9b 100644 --- a/pkg/gui/merge_panel.go +++ b/pkg/gui/merge_panel.go @@ -257,8 +257,12 @@ func (gui *Gui) handleCompleteMerge(g *gocui.Gui) error { gui.stageSelectedFile(g) gui.refreshFiles(g) if rebase, err := gui.GitCommand.IsInRebaseState(); rebase && err == nil { - gui.GitCommand.ContinueRebaseBranch() - gui.refreshSidePanels(g) + if err := gui.GitCommand.ContinueRebaseBranch(); err != nil { + gui.Log.Errorln(err) + } + if err := gui.refreshSidePanels(g); err != nil { + gui.Log.Errorln(err) + } } return gui.switchFocus(g, nil, filesView) } |