repo git: don't try to resolve conflicts when a rebase failed due to locked files
This commit is contained in:
parent
a5218c8e1f
commit
cd6f69ef43
|
@ -472,8 +472,8 @@ namespace SparkleLib.Git {
|
||||||
git.StartAndWaitForExit ();
|
git.StartAndWaitForExit ();
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
|
||||||
|
|
||||||
|
} else {
|
||||||
SparkleLogger.LogInfo ("Git", Name + " | Conflict detected, trying to get out...");
|
SparkleLogger.LogInfo ("Git", Name + " | Conflict detected, trying to get out...");
|
||||||
string rebase_apply_path = new string [] { LocalPath, ".git", "rebase-apply" }.Combine ();
|
string rebase_apply_path = new string [] { LocalPath, ".git", "rebase-apply" }.Combine ();
|
||||||
|
|
||||||
|
@ -489,6 +489,7 @@ namespace SparkleLib.Git {
|
||||||
SparkleLogger.LogInfo ("Git", Name + " | Conflict resolved");
|
SparkleLogger.LogInfo ("Git", Name + " | Conflict resolved");
|
||||||
OnConflictResolved ();
|
OnConflictResolved ();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
git = new SparkleGit (LocalPath, "config core.ignorecase false");
|
git = new SparkleGit (LocalPath, "config core.ignorecase false");
|
||||||
git.StartAndWaitForExit ();
|
git.StartAndWaitForExit ();
|
||||||
|
|
Loading…
Reference in a new issue