repo: add debug info about conflict type when resolving
This commit is contained in:
parent
f97ce17b52
commit
93c55170af
|
@ -640,6 +640,8 @@ namespace SparkleLib {
|
||||||
string conflicting_path = line.Substring (3);
|
string conflicting_path = line.Substring (3);
|
||||||
conflicting_path = conflicting_path.Trim ("\"".ToCharArray ());
|
conflicting_path = conflicting_path.Trim ("\"".ToCharArray ());
|
||||||
|
|
||||||
|
SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Conflict type: " + line);
|
||||||
|
|
||||||
// Both the local and server version have been modified
|
// Both the local and server version have been modified
|
||||||
if (line.StartsWith ("UU") || line.StartsWith ("AA") ||
|
if (line.StartsWith ("UU") || line.StartsWith ("AA") ||
|
||||||
line.StartsWith ("AU") || line.StartsWith ("UA")) {
|
line.StartsWith ("AU") || line.StartsWith ("UA")) {
|
||||||
|
|
Loading…
Reference in a new issue