fix: conflict files pane was opened on pull error

denolehov · Mar 24, 2021 · 8d43e7b · 8d43e7b
1 parent 358dc6e
commit 8d43e7b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/main.ts b/main.ts
@@ -284,7 +284,7 @@ export default class ObsidianGit extends Plugin {
                 if (err) {
                     this.displayError(`Pull failed ${err.message}`);
                     const status = await this.git.status();
-                    if (status.conflicted.length >= 0) {
+                    if (status.conflicted.length > 0) {
                         this.handleConflict(status.conflicted);
                     }
                 }