Update sync-upstream.yml

jhipster · Nov 3, 2024 · 4f172de · 4f172de
1 parent 77e3703
commit 4f172de
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/.github/workflows/sync-upstream.yml b/.github/workflows/sync-upstream.yml
@@ -59,16 +59,16 @@ jobs:
           echo "merge_status=up_to_date" >> $GITHUB_ENV
         fi
 
+    - name: Commit merge conflicts
+      if: ${{ env.branch_exists != 'true' && env.merge_status != 'up_to_date' }}
+      run: git commit -a --no-edit || true
+
     - name: Remove workflow files
       if: ${{ env.branch_exists != 'true' && env.merge_status != 'up_to_date' }}
       run: |
         git rm -r --cached .github/workflows/deploy.yml || true
         git commit -m "Remove upstream workflow files" || true
         
-    - name: Commit merge conflicts
-      if: ${{ env.branch_exists != 'true' && env.merge_status != 'up_to_date' }}
-      run: git commit -a --no-edit || true
-
     - name: Find conflict files
       if: ${{ env.branch_exists != 'true' && env.merge_status != 'up_to_date' }}
       id: find-conflict-files