From 1f889aca1cdd88cbf3e75a3fd486b6a73e413775 Mon Sep 17 00:00:00 2001 From: Abdelilah El Aissaoui Date: Wed, 22 Jun 2022 10:40:41 +0200 Subject: [PATCH] Fixed reset on conflicted files --- src/main/kotlin/app/git/StatusManager.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/app/git/StatusManager.kt b/src/main/kotlin/app/git/StatusManager.kt index f0a511b..0913124 100644 --- a/src/main/kotlin/app/git/StatusManager.kt +++ b/src/main/kotlin/app/git/StatusManager.kt @@ -216,7 +216,7 @@ class StatusManager @Inject constructor( } suspend fun reset(git: Git, statusEntry: StatusEntry, staged: Boolean) = withContext(Dispatchers.IO) { - if (staged) { + if (staged || statusEntry.statusType == StatusType.CONFLICTING) { git .reset() .addPath(statusEntry.filePath)