fix: conflict files pane was opened on pull error

Vinzent03 · Vinzent03 · commit 8d43e7b32e7b · 2021-03-24T10:55:08.000+01:00
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);
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,7 @@ export default class ObsidianGit extends Plugin {`
`284`	`284`	`if (err) {`
`285`	`285`	this.displayError(`Pull failed ${err.message}`);
`286`	`286`	`const status = await this.git.status();`
`287`		`- if (status.conflicted.length >= 0) {`
	`287`	`+ if (status.conflicted.length > 0) {`
`288`	`288`	`this.handleConflict(status.conflicted);`
`289`	`289`	`}`
`290`	`290`	`}`