disable file monitoring while resolving conflicts
This commit is contained in:
parent
c90251764d
commit
68ada3a206
|
@ -243,6 +243,8 @@ namespace SparkleShare {
|
||||||
Process.WaitForExit ();
|
Process.WaitForExit ();
|
||||||
Process.Start();
|
Process.Start();
|
||||||
|
|
||||||
|
Watcher.EnableRaisingEvents = false;
|
||||||
|
|
||||||
foreach (string Line in Regex.Split (Output, "\n")) {
|
foreach (string Line in Regex.Split (Output, "\n")) {
|
||||||
|
|
||||||
if (Line.Contains ("needs merge")) {
|
if (Line.Contains ("needs merge")) {
|
||||||
|
@ -261,7 +263,7 @@ namespace SparkleShare {
|
||||||
|
|
||||||
File.Move (ProblemFileName,
|
File.Move (ProblemFileName,
|
||||||
ProblemFileName + " (" + UserName + " - " +
|
ProblemFileName + " (" + UserName + " - " +
|
||||||
TimeStamp);
|
TimeStamp + ")");
|
||||||
|
|
||||||
Process.StartInfo.Arguments
|
Process.StartInfo.Arguments
|
||||||
= "checkout --theirs " + ProblemFileName;
|
= "checkout --theirs " + ProblemFileName;
|
||||||
|
@ -286,6 +288,8 @@ namespace SparkleShare {
|
||||||
Process.Start();
|
Process.Start();
|
||||||
Console.WriteLine ("[Git][" + Name + "] Conflict resolved.");
|
Console.WriteLine ("[Git][" + Name + "] Conflict resolved.");
|
||||||
|
|
||||||
|
Watcher.EnableRaisingEvents = true;
|
||||||
|
|
||||||
Push ();
|
Push ();
|
||||||
Fetch ();
|
Fetch ();
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue