From e6a8dc0bcfc8b8ceb21ea685509e1382ac591190 Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Tue, 25 Feb 2020 22:00:20 +1100
Subject: [PATCH] better logic for checking if we're rebasing

---
 pkg/gui/status_panel.go | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkg/gui/status_panel.go b/pkg/gui/status_panel.go
index 39d85411e..4c69e9b30 100644
--- a/pkg/gui/status_panel.go
+++ b/pkg/gui/status_panel.go
@@ -136,14 +136,6 @@ func lazygitTitle() string {
 }
 
 func (gui *Gui) updateWorkTreeState() error {
-	merging, err := gui.GitCommand.IsInMergeState()
-	if err != nil {
-		return err
-	}
-	if merging {
-		gui.State.WorkingTreeState = "merging"
-		return nil
-	}
 	rebaseMode, err := gui.GitCommand.RebaseMode()
 	if err != nil {
 		return err
@@ -152,6 +144,14 @@ func (gui *Gui) updateWorkTreeState() error {
 		gui.State.WorkingTreeState = "rebasing"
 		return nil
 	}
+	merging, err := gui.GitCommand.IsInMergeState()
+	if err != nil {
+		return err
+	}
+	if merging {
+		gui.State.WorkingTreeState = "merging"
+		return nil
+	}
 	gui.State.WorkingTreeState = "normal"
 	return nil
 }