repo git: catch IOException in ResolveConflict method
This commit is contained in:
parent
e439d53a7b
commit
cf84864911
|
@ -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 ();
|
||||
|
|
Loading…
Reference in a new issue