do not abort merge when patch fails (#51)

bates64 · Aug 6, 2023 · 646ce92 · 646ce92
2 parents ebf010c + 74d3d2a
commit 646ce92
Showing 1 changed file with 2 additions and 11 deletions.
diff --git a/src/package.rs b/src/package.rs
@@ -198,17 +198,8 @@ impl Package {
             .current_dir(&repo)
             .status()?;
         if !status.success() {
-            // The merge failed! Abort the merge and tell the user to fix it.
-            let status = Command::new("git")
-                .arg("am")
-                .arg("--abort")
-                .current_dir(&repo)
-                .status()?;
-            if !status.success() {
-                panic!("failed to abort merge");
-            }
-            bail!("failed to apply patches");
-        }
+            log::warn!("Failed to merge. Resolve merge conflicts (either using `git mergetool` or vscode's merge editor) and commit them to continue.");
+        }   
         Ok(())
     }