diff --git a/SparkleLib/Git/SparkleRepoGit.cs b/SparkleLib/Git/SparkleRepoGit.cs
index f634571a..5617270c 100644
--- a/SparkleLib/Git/SparkleRepoGit.cs
+++ b/SparkleLib/Git/SparkleRepoGit.cs
@@ -513,6 +513,7 @@ namespace SparkleLib.Git {
                     return false;
                 
                 } else {
+                    SparkleLogger.LogInfo ("", error_output);
                     SparkleLogger.LogInfo ("Git", Name + " | Conflict detected, trying to get out...");
                     
                     while (Directory.Exists (rebase_apply_path) && HasLocalChanges) {
@@ -584,12 +585,12 @@ namespace SparkleLib.Git {
                     continue;
                 }
 
+                SparkleLogger.LogInfo ("Git", Name + " | Resolving: " + line);
+
                 // Both the local and server version have been modified
                 if (line.StartsWith ("UU") || line.StartsWith ("AA") ||
                     line.StartsWith ("AU") || line.StartsWith ("UA")) {
 
-                    SparkleLogger.LogInfo ("Git", Name + " | Resolving: " + line);
-
                     // Recover local version
                     SparkleGit git_theirs = new SparkleGit (LocalPath, "checkout --theirs \"" + conflicting_path + "\"");
                     git_theirs.StartAndWaitForExit ();
@@ -615,7 +616,6 @@ namespace SparkleLib.Git {
 
                 // The local version has been modified, but the server version was removed
                 } else if (line.StartsWith ("DU")) {
-                    SparkleLogger.LogInfo ("Git", Name + " | Resolving: " + line);
 
                     // The modified local version is already in the checkout, so it just needs to be added.
                     // We need to specifically mention the file, so we can't reuse the Add () method
@@ -624,8 +624,21 @@ namespace SparkleLib.Git {
 
                     changes_added = true;
                 
-                } else {
+                // The server version has been modified, but the local version was removed
+                } else if (line.StartsWith ("UD")) {
+                    
+                    // 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
+                } else if (line.StartsWith ("DD")) {
                     SparkleLogger.LogInfo ("Git", Name + " | No need to resolve: " + line);
+
+                // New local files
+                } else if (line.StartsWith ("??")) {
+                    changes_added = true;
                 }
             }
 
@@ -693,18 +706,6 @@ namespace SparkleLib.Git {
         }
 
 
-        public override List<SparkleChangeSet> GetChangeSets (string path)
-        {
-            return GetChangeSetsInternal (path);
-        }   
-
-
-        public override List<SparkleChangeSet> GetChangeSets ()
-        {
-            return GetChangeSetsInternal (null);
-        }
-
-
         private bool FindError (string line)
         {
             Error = ErrorStatus.None;
@@ -738,6 +739,16 @@ namespace SparkleLib.Git {
         }
 
 
+        public override List<SparkleChangeSet> GetChangeSets ()
+        {
+            return GetChangeSetsInternal (null);
+        }
+
+        public override List<SparkleChangeSet> GetChangeSets (string path)
+        {
+            return GetChangeSetsInternal (path);
+        }   
+
         private List<SparkleChangeSet> GetChangeSetsInternal (string path)
         {
             List <SparkleChangeSet> change_sets = new List <SparkleChangeSet> ();
diff --git a/SparkleLib/SparkleLogger.cs b/SparkleLib/SparkleLogger.cs
index 68889ede..cec04796 100755
--- a/SparkleLib/SparkleLogger.cs
+++ b/SparkleLib/SparkleLogger.cs
@@ -34,7 +34,12 @@ namespace SparkleLib {
         public static void LogInfo (string type, string message, Exception exception)
         {
             string timestamp = DateTime.Now.ToString ("HH:mm:ss");
-            string line      = timestamp + " | " + type + " | " + message;
+            string line;
+
+            if (string.IsNullOrEmpty (type))
+                line = timestamp + " | " + message;
+            else
+                line = timestamp + " | " + type + " | " + message;
 
             if (exception != null)
                 line += ": " + exception.Message + " " + exception.StackTrace;