From 7ceef6a472db9d19f880f4537343093e0d15aac9 Mon Sep 17 00:00:00 2001 From: Ryan Blue Date: Mon, 23 Dec 2024 13:26:27 -0500 Subject: [PATCH] Apply java patch --- .github/workflows/comment-command.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/comment-command.yml b/.github/workflows/comment-command.yml index 8ffd6e56b8b..b72798153a8 100644 --- 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