From aeafa39c0de4246b8c7c9d69cb6cd0d848dff71d Mon Sep 17 00:00:00 2001
From: Hylke Bons <hylkebons@gmail.com>
Date: Mon, 2 Jul 2012 23:42:49 +0200
Subject: [PATCH] repo git: catch IOException in ResolveConflict method

---
 SparkleLib/Git/SparkleRepoGit.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

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 ();