beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

repo git: catch IOException in ResolveConflict method

Browse source
This commit is contained in:
Hylke Bons 2012-07-02 23:42:49 +02:00
parent f28dfd0318
commit aeafa39c0d
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
SparkleLib/Git/SparkleRepoGit.cs
View file

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