From 70d09390f7169c8fd9b3c8a04bed54c2dbafc208 Mon Sep 17 00:00:00 2001
From: ViscousPot <viscouspotential@gmail.com>
Date: Wed, 18 Dec 2024 07:55:44 +0000
Subject: [PATCH] fix: not catching all checkout conflict exceptions

---
 app/src/main/java/com/viscouspot/gitsync/util/GitManager.kt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/viscouspot/gitsync/util/GitManager.kt b/app/src/main/java/com/viscouspot/gitsync/util/GitManager.kt
index 4b7bb704..b9656cde 100644
--- a/app/src/main/java/com/viscouspot/gitsync/util/GitManager.kt
+++ b/app/src/main/java/com/viscouspot/gitsync/util/GitManager.kt
@@ -25,6 +25,7 @@ import org.eclipse.jgit.api.errors.JGitInternalException
 import org.eclipse.jgit.api.errors.WrongRepositoryStateException
 import org.eclipse.jgit.diff.DiffFormatter
 import org.eclipse.jgit.errors.CheckoutConflictException
+import org.eclipse.jgit.api.errors.CheckoutConflictException as ApiCheckoutConflictException
 import org.eclipse.jgit.errors.NotSupportedException
 import org.eclipse.jgit.errors.TransportException
 import org.eclipse.jgit.internal.JGitText
@@ -226,7 +227,10 @@ class GitManager(private val context: Context, private val settingsManager: Sett
         } catch (e: CheckoutConflictException) {
             log(LogType.PullFromRepo, e.stackTraceToString())
             return false
-        } catch (e: WrongRepositoryStateException) {
+        }catch (e: ApiCheckoutConflictException) {
+            log(LogType.PullFromRepo, e.stackTraceToString())
+            return false
+        }  catch (e: WrongRepositoryStateException) {
             if (e.message?.contains(context.getString(R.string.merging_exception_message)) == true) {
                 log(LogType.PullFromRepo, "Merge conflict")
                 return false