refactor: use mergeDriver for the merge strategy

- Integrate force param into pullChangesFromRemote
- Get rid of the vendored package, use existing mergeDriver

Author: thegeneralist01

src/commands.ts

@@ -126,7 +126,7 @@ export function addCommmands(plugin: ObsidianGit) {
         id: "force-pull",
         name: "Force pull",
         callback: () =>
-            plugin.promiseQueue.addTask(() => plugin.forcePullChangesFromRemote()),
+            plugin.promiseQueue.addTask(() => plugin.pullChangesFromRemote(true)),
     });
 
     plugin.addCommand({

src/gitManager/isomorphicGit.ts

@@ -479,7 +479,10 @@ export class IsomorphicGit extends GitManager {
                     ours: branchInfo.current,
                     theirs: branchInfo.tracking!,
                     abortOnConflict: false,
-                    strategyOption: force ? "theirs" : undefined,
+                    mergeDriver: force ? ({ contents }) => {
+                        const mergedText = contents[2];
+                        return { cleanMerge: true, mergedText };
+                    } : undefined,
                 })
             );
             if (!mergeRes.alreadyMerged) {

src/main.ts

@@ -748,38 +748,10 @@ export default class ObsidianGit extends Plugin {
     }
 
     ///Used for command
-    async pullChangesFromRemote(): Promise<void> {
+    async pullChangesFromRemote(force: boolean = false): Promise<void> {
         if (!(await this.isAllInitialized())) return;
 
-        const filesUpdated = await this.pull(false);
-        if (filesUpdated === false) {
-            return;
-        }
-        if (!filesUpdated) {
-            this.displayMessage("Pull: Everything is up-to-date");
-        }
-
-        if (this.gitManager instanceof SimpleGit) {
-            const status = await this.updateCachedStatus();
-            if (status.conflicted.length > 0) {
-                this.displayError(
-                    `You have conflicts in ${status.conflicted.length} ${
-                        status.conflicted.length == 1 ? "file" : "files"
-                    }`
-                );
-                await this.handleConflict(status.conflicted);
-            }
-        }
-
-        this.app.workspace.trigger("obsidian-git:refresh");
-        this.setPluginState({ gitAction: CurrentGitAction.idle });
-    }
-
-    ///Used for command
-    async forcePullChangesFromRemote(): Promise<void> {
-        if (!(await this.isAllInitialized())) return;
-
-        const filesUpdated = await this.pull(true);
+        const filesUpdated = await this.pull(force);
         if (filesUpdated === false) {
             return;
         }