diff options
| author | Glenn Vriesman <glenn.vriesman@gmail.com> | 2018-12-02 17:34:15 +0100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2018-12-11 09:39:54 +1100 |
| commit | e39d2ed44bc8cc187abe3cd59349c40ca126b7a6 (patch) | |
| tree | c1081965295fc91341125bef261599c7e742bf03 /pkg/gui/merge_panel.go | |
| parent | 7a7e88577341f314ff54ef50474390f1f94d4b91 (diff) | |
Added check to invoke continue/refresh
Diffstat (limited to 'pkg/gui/merge_panel.go')
| -rw-r--r-- | pkg/gui/merge_panel.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkg/gui/merge_panel.go b/pkg/gui/merge_panel.go index 2592275bf..1a4a25816 100644 --- a/pkg/gui/merge_panel.go +++ b/pkg/gui/merge_panel.go @@ -256,5 +256,9 @@ 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) + } return gui.switchFocus(g, nil, filesView) } |