From 957b167ebc9fba706ea1d7b2c482ecb519017d0e Mon Sep 17 00:00:00 2001
From: Min Jin <minkimzz@amazon.com>
Date: Mon, 12 May 2025 13:48:58 -0700
Subject: [PATCH] use patch cmd instead of `git apply` for conflict toleration

Signed-off-by: Min Jin <minkimzz@amazon.com>
---
 .github/workflows/generate.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/generate.yml b/.github/workflows/generate.yml
index 4717f0982f..c734eadcfc 100644
--- a/.github/workflows/generate.yml
+++ b/.github/workflows/generate.yml
@@ -80,8 +80,8 @@ jobs:
       - name: Apply Manual Diffs
         if: ${{ github.event.inputs.skip_patches != 'true' }}
         run: |
-          ls scripts/patches/*.diff | xargs git apply
-          git add .
+          ls scripts/patches/*.diff | xargs -I {} patch -i {}
+          git add *.java
           git commit -s -m 'Applied patches under scripts/patches/*.diff'
       - name: Generate Fluent
         run: |