beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

repo git: add more debug info for resolving conflicts

Browse source
This commit is contained in:
Hylke Bons 2013-07-10 17:11:16 +01:00
parent 7955f10826
commit abaeae1465
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
SparkleLib/Git/SparkleRepoGit.cs
View file

@ -630,6 +630,7 @@ namespace SparkleLib.Git {
// Recover server version
SparkleGit git_theirs = new SparkleGit (LocalPath, "checkout --ours \"" + conflicting_path + "\"");
git_theirs.StartAndWaitForExit ();
changes_added = true;
// Server and local versions were removed
@ -638,7 +639,11 @@ namespace SparkleLib.Git {
// New local files
} else if (line.StartsWith ("??")) {
SparkleLogger.LogInfo ("Git", Name + " | Found new file, no need to resolve: " + line);
changes_added = true;
} else {
SparkleLogger.LogInfo ("Git", Name + " | Don't know what to do with: " + line);
}
}