Merge pull request #4041 from yue9944882/fix-patch-cmd

Use patch cmd instead of `git apply` for conflict toleration

Author: k8s-ci-robot

.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: |