Added check to invoke continue/refresh

zanuka · Dec 10, 2018 · e39d2ed · e39d2ed
1 parent 7a7e885
commit e39d2ed
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/pkg/gui/branches_panel.go b/pkg/gui/branches_panel.go
@@ -108,17 +108,16 @@ func (gui *Gui) handleRebase(g *gocui.Gui, v *gocui.View) error {
 			}
 
 			if err := gui.GitCommand.RebaseBranch(selectedBranch); err != nil {
+				gui.Log.Errorln(err)
 				if err := gui.createConfirmationPanel(g, v, "Rebase failed", "Rebasing failed, would you like to resolve it?",
 					func(g *gocui.Gui, v *gocui.View) error {
 						return nil
-					},
-					func(g *gocui.Gui, v *gocui.View) error {
+					}, func(g *gocui.Gui, v *gocui.View) error {
 						return gui.GitCommand.AbortRebaseBranch()
 					}); err != nil {
 				}
 			}
 
-			gui.Log.Println("Reached refresh")
 			return gui.refreshSidePanels(g)
 		}, nil)
 }

diff --git 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)
 }