repo git: catch IOException in ResolveConflict method
This commit is contained in:
parent
f28dfd0318
commit
aeafa39c0d
|
@ -467,8 +467,14 @@ namespace SparkleLib.Git {
|
||||||
if (git.ExitCode != 0) {
|
if (git.ExitCode != 0) {
|
||||||
SparkleHelpers.DebugInfo ("Git", Name + " | Conflict detected, trying to get out...");
|
SparkleHelpers.DebugInfo ("Git", Name + " | Conflict detected, trying to get out...");
|
||||||
|
|
||||||
while (HasLocalChanges)
|
while (HasLocalChanges) {
|
||||||
ResolveConflict ();
|
try {
|
||||||
|
ResolveConflict ();
|
||||||
|
|
||||||
|
} catch (IOException e) {
|
||||||
|
SparkleHelpers.DebugInfo ("Git", Name + " | Failed to resolve conflict, trying again...");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
SparkleHelpers.DebugInfo ("Git", Name + " | Conflict resolved");
|
SparkleHelpers.DebugInfo ("Git", Name + " | Conflict resolved");
|
||||||
OnConflictResolved ();
|
OnConflictResolved ();
|
||||||
|
|
Loading…
Reference in a new issue