Closes #3 RM/RM conflicts state

Refs #5
[add][wip] manage conflicts

app/src/main/java/info/knacki/pass/ui/GitPullActivity.java

@@ -136,10 +136,10 @@ public class GitPullActivity extends AppCompatActivity {
                 final String currentHash = GitSha1.BytesToString(GitSha1.getRawSha1OfFile(new File(PathUtils.GetPassDir(this) +i)));
                 final boolean localChanged = !currentHash.equals(localVersion.GetHash(i, ""));
 
-                if (localChanged)
-                    conflictingFiles.put(i, null);
-                else
+                if (!localChanged || "".equals(currentHash))
                     filesToPull.put(i, null);
+                else
+                    conflictingFiles.put(i, null);
             }
         }
         CheckNewFiles(localVersion, new File(PathUtils.GetPassDir(this)), "", filesToPull.keySet(), filesToPush, conflictingFiles.keySet());