repo git: add more debug info for resolving conflicts
This commit is contained in:
parent
c5c5b4d4cf
commit
c103fdb3e6
|
@ -630,6 +630,7 @@ namespace SparkleLib.Git {
|
||||||
// Recover server version
|
// Recover server version
|
||||||
SparkleGit git_theirs = new SparkleGit (LocalPath, "checkout --ours \"" + conflicting_path + "\"");
|
SparkleGit git_theirs = new SparkleGit (LocalPath, "checkout --ours \"" + conflicting_path + "\"");
|
||||||
git_theirs.StartAndWaitForExit ();
|
git_theirs.StartAndWaitForExit ();
|
||||||
|
|
||||||
changes_added = true;
|
changes_added = true;
|
||||||
|
|
||||||
// Server and local versions were removed
|
// Server and local versions were removed
|
||||||
|
@ -638,7 +639,11 @@ namespace SparkleLib.Git {
|
||||||
|
|
||||||
// New local files
|
// New local files
|
||||||
} else if (line.StartsWith ("??")) {
|
} else if (line.StartsWith ("??")) {
|
||||||
|
SparkleLogger.LogInfo ("Git", Name + " | Found new file, no need to resolve: " + line);
|
||||||
changes_added = true;
|
changes_added = true;
|
||||||
|
|
||||||
|
} else {
|
||||||
|
SparkleLogger.LogInfo ("Git", Name + " | Don't know what to do with: " + line);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue