diff --git a/SparkleLib/Git/SparkleRepoGit.cs b/SparkleLib/Git/SparkleRepoGit.cs
index b0892e90..db33c004 100644
--- a/SparkleLib/Git/SparkleRepoGit.cs
+++ b/SparkleLib/Git/SparkleRepoGit.cs
@@ -467,8 +467,14 @@ namespace SparkleLib.Git {
             if (git.ExitCode != 0) {
                 SparkleHelpers.DebugInfo ("Git", Name + " | Conflict detected, trying to get out...");
 
-                while (HasLocalChanges)
-                    ResolveConflict ();
+                while (HasLocalChanges) {
+                    try {
+                        ResolveConflict ();
+
+                    } catch (IOException e) {
+                        SparkleHelpers.DebugInfo ("Git", Name + " | Failed to resolve conflict, trying again...");
+                    }
+                }
 
                 SparkleHelpers.DebugInfo ("Git", Name + " | Conflict resolved");
                 OnConflictResolved ();