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

repo: add debug info about conflict type when resolving

Browse source
This commit is contained in:
Hylke Bons 2011-05-06 11:31:30 +01:00
parent eff71a65ae
commit 2400fa6d6f
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SparkleLib/SparkleRepo.cs
View file

@ -640,6 +640,8 @@ namespace SparkleLib {
string conflicting_path = line.Substring (3);
conflicting_path = conflicting_path.Trim ("\"".ToCharArray ());
SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Conflict type: " + line);
// Both the local and server version have been modified
if (line.StartsWith ("UU") || line.StartsWith ("AA") ||
line.StartsWith ("AU") || line.StartsWith ("UA")) {