sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-10-25 05:37:37 +03:00
Code Activity

Added check to invoke continue/refresh

Browse Source
This commit is contained in:
Glenn Vriesman
2018-12-02 17:34:15 +01:00
committed by Jesse Duffield
parent 7a7e885773
commit e39d2ed44b
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/gui/merge_panel.go
View File

@@ -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)
}