Fix workflow failures: concurrency group + non-fatal commits

Two issues causing "run failed" emails:

1. update-patches had no concurrency group, so it raced with
   fetch-all-patches at hours 0/6/12/18 and on pushes. Both
   tried to commit patches.json simultaneously. Now both share
   the "patch-updates" concurrency group so they queue.

2. When git pull --rebase hit a conflict on patches.json, the
   step failed and blocked the Pages deploy entirely. Now the
   commit step has continue-on-error and rebase --abort fallback,
   so the deploy always runs with the freshly aggregated data.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: Toreburn

.github/workflows/fetch-all-patches.yml

@@ -153,14 +153,15 @@ jobs:
         continue-on-error: true  # Don't block deploy, but annotations will surface
 
       - name: Commit and push changes
+        continue-on-error: true  # Don't block deploy if push conflicts
         run: |
           git config --local user.email "action@github.com"
           git config --local user.name "GitHub Action"
           git add data/
           if ! git diff --staged --quiet; then
             git commit -m "Update patch data $(date -u +%Y-%m-%d)"
-            git pull --rebase origin master
-            git push
+            git pull --rebase origin master || git rebase --abort
+            git push || echo "Push failed, will still deploy from working directory"
           fi
 
       - name: Prepare site directory

.github/workflows/update-patches.yml

@@ -8,6 +8,10 @@ on:
     paths:
       - '.github/workflows/update-patches.yml'
 
+concurrency:
+  group: patch-updates
+  cancel-in-progress: false
+
 jobs:
   update-patches:
     runs-on: ubuntu-latest
@@ -37,14 +41,15 @@ jobs:
         run: node scripts/fetch-patches.js
 
       - name: Commit and push if changes
+        continue-on-error: true  # Don't block deploy if push conflicts
         run: |
           git config --local user.email "action@github.com"
           git config --local user.name "GitHub Action"
           git add data/patches.json data/vendors/*.json
           if ! git diff --staged --quiet; then
             git commit -m "Update patch data [skip ci]"
-            git pull --rebase origin master
-            git push
+            git pull --rebase origin master || git rebase --abort
+            git push || echo "Push failed, will still deploy from working directory"
           fi
 
       - name: Prepare site directory