diff --git a/SparkleLib/Git/SparkleRepoGit.cs b/SparkleLib/Git/SparkleRepoGit.cs
index 446fb2ad..6a28c8f8 100644
--- a/SparkleLib/Git/SparkleRepoGit.cs
+++ b/SparkleLib/Git/SparkleRepoGit.cs
@@ -485,7 +485,9 @@ namespace SparkleLib.Git {
                 SparkleHelpers.DebugInfo ("Git", Name + " | Conflict type: " + line);
 
                 // Ignore conflicts in the .sparkleshare file and use the local version
-                if (conflicting_path.EndsWith (".sparkleshare")) {
+                if (conflicting_path.EndsWith (".sparkleshare") ||
+                    conflicting_path.EndsWith (".empty")) {
+
                     // Recover local version
                     SparkleGit git_theirs = new SparkleGit (LocalPath,
                         "checkout --theirs \"" + conflicting_path + "\"");
@@ -493,6 +495,8 @@ namespace SparkleLib.Git {
                     git_theirs.Start ();
                     git_theirs.WaitForExit ();
 
+                    File.SetAttributes (Path.Combine (LocalPath, conflicting_path), FileAttributes.Hidden);
+
                     SparkleGit git_rebase_continue = new SparkleGit (LocalPath, "rebase --continue");
                     git_rebase_continue.Start ();
                     git_rebase_continue.WaitForExit ();