repo git: only disable emable watching once
This commit is contained in:
parent
db71ae2ce9
commit
99cf47e45c
|
@ -230,13 +230,11 @@ namespace SparkleLib {
|
|||
|
||||
if (git.ExitCode != 0) {
|
||||
SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Conflict detected. Trying to get out...");
|
||||
DisableWatching ();
|
||||
|
||||
while (AnyDifferences)
|
||||
ResolveConflict ();
|
||||
|
||||
SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Conflict resolved.");
|
||||
EnableWatching ();
|
||||
|
||||
OnConflictResolved ();
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue