fix: properly resolve merge conflict

close #502
denolehov · Jun 2, 2023 · 80c0b65 · 80c0b65
1 parent c135c0b
commit 80c0b65
Showing 1 changed file with 17 additions and 3 deletions.
diff --git a/src/main.ts b/src/main.ts
@@ -704,7 +704,7 @@ export default class ObsidianGit extends Plugin {
         await this.saveData(this.settings);
     }
 
-    async saveLastAuto(date: Date, mode: "backup" | "pull" | "push") {
+    saveLastAuto(date: Date, mode: "backup" | "pull" | "push") {
         if (mode === "backup") {
             this.localStorage.setLastAutoBackup(date.toString());
         } else if (mode === "pull") {
@@ -714,7 +714,7 @@ export default class ObsidianGit extends Plugin {
         }
     }
 
-    async loadLastAuto(): Promise<{ backup: Date; pull: Date; push: Date }> {
+    loadLastAuto(): { backup: Date; pull: Date; push: Date } {
         return {
             backup: new Date(this.localStorage.getLastAutoBackup() ?? ""),
             pull: new Date(this.localStorage.getLastAutoPull() ?? ""),
@@ -982,7 +982,7 @@ export default class ObsidianGit extends Plugin {
     }): Promise<boolean> {
         if (!(await this.isAllInitialized())) return false;
 
-        const hadConflict = this.localStorage.getConflict() === "true";
+        let hadConflict = this.localStorage.getConflict() === "true";
 
         let changedFiles: { vault_path: string }[];
         let status: Status | undefined;
@@ -992,6 +992,12 @@ export default class ObsidianGit extends Plugin {
             this.mayDeleteConflictFile();
             status = await this.updateCachedStatus();
 
+            //Should not be necessary, but just in case
+            if (status.conflicted.length == 0) {
+                this.localStorage.setConflict("false");
+                hadConflict = false;
+            }
+
             // check for conflict files on auto backup
             if (fromAutoBackup && status.conflicted.length > 0) {
                 this.displayError(
@@ -1078,6 +1084,14 @@ export default class ObsidianGit extends Plugin {
                     unstagedFiles,
                 });
             }
+
+            //Handle resolved conflict after commit
+            if (this.gitManager instanceof SimpleGit) {
+                if ((await this.updateCachedStatus()).conflicted.length == 0) {
+                    this.localStorage.setConflict("false");
+                }
+            }
+
             let roughly = false;
             if (committedFiles === undefined) {
                 roughly = true;