remove version

Signed-off-by: Coleen Iona Quadros <[email protected]>
rhobs · Jul 25, 2024 · 342a907 · 342a907
1 parent 9999e2a
commit 342a907
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.github/workflows/merge-acm-flow.yaml b/.github/workflows/merge-acm-flow.yaml
@@ -144,8 +144,8 @@ jobs:
         if: ${{ steps.merge.outputs.MERGE_CONFLICT == 'true' && inputs.restore-upstream != ''}}
         run: |
           echo "reset ${{ inputs.restore-upstream }}"
-          git checkout --theirs ${{ inputs.restore-upstream }}
-          git add ${{ inputs.restore-upstream }}
+          git checkout --theirs ${{ inputs.restore-upstream }} || true
+          git add ${{ inputs.restore-upstream }} || true
       - name: Remove deleted files
         if: ${{ steps.merge.outputs.MERGE_CONFLICT == 'true' }}
         run: |