Apply java patch

rzblue · Dec 23, 2024 · 7ceef6a · 7ceef6a
1 parent f25206c
commit 7ceef6a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.github/workflows/comment-command.yml b/.github/workflows/comment-command.yml
@@ -39,8 +39,8 @@ jobs:
       - name: Apply patch
         run: |
           git apply wpiformat-fixes.patch --index
-          git apply javaformat-fixes.patch --index
-
+          # Apply java format and prefer new changes
+          git apply javaformat-fixes.patch --3way --theirs --index
       - name: Commit
         run: |
           # Set credentials