Apply patches with rejects

neoforged · Feb 8, 2025 · 5aa4f93 · 5aa4f93
1 parent 7127faf
commit 5aa4f93
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/main/java/net/neoforged/automation/command/BackportCommand.java b/src/main/java/net/neoforged/automation/command/BackportCommand.java
@@ -81,7 +81,7 @@ public static void applyPatch(GitHub gh, GHPullRequest pr, Configuration configu
                                 runner.saveCache("gradle", runner.resolveHome(".gradle/"));
 
                                 runner.writeFile("__diff", diff);
-                                runner.git("apply", "--ignore-whitespace", "--recount", "-C0", "__diff");
+                                runner.git("apply", "--ignore-whitespace", "--recount", "-C0", "--reject", "__diff");
                                 runner.exec("rm", "__diff");
 
                                 if (!backport.postApplyCommands().isEmpty()) {