From 2e0e616dc252fcd0e22d64008232c273af80f816 Mon Sep 17 00:00:00 2001
From: Abdelilah El Aissaoui <aeab13@gmail.com>
Date: Sun, 23 Oct 2022 18:01:23 +0200
Subject: [PATCH] Fixed uncommited changes graph line not being drawn when
 having conflicts

---
 src/main/kotlin/com/jetpackduba/gitnuro/ui/log/Log.kt | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/log/Log.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/log/Log.kt
index 9ef2309..aede952 100644
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/log/Log.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/log/Log.kt
@@ -162,6 +162,7 @@ fun Log(
                     commitList = commitList,
                     selectedCommit = selectedCommit,
                     selectedItem = selectedItem,
+                    repositoryState = repositoryState,
                     horizontalScrollState = horizontalScrollState,
                     graphWidth = graphWidth,
                     verticalScrollState = verticalScrollState,
@@ -434,6 +435,7 @@ fun GraphList(
     selectedCommit: RevCommit?,
     selectedItem: SelectedItem,
     commitsLimit: Int,
+    repositoryState: RepositoryState,
 ) {
     val maxLinePosition = if (commitList.isNotEmpty())
         commitList.maxLine
@@ -462,7 +464,12 @@ fun GraphList(
             LazyColumn(
                 state = verticalScrollState, modifier = Modifier.width(graphRealWidth)
             ) {
-                if (hasUncommitedChanges) {
+                if (
+                    hasUncommitedChanges ||
+                    repositoryState.isMerging ||
+                    repositoryState.isRebasing ||
+                    repositoryState.isCherryPicking
+                ) {
                     item {
                         Row(
                             modifier = Modifier