From decd2bbd44cf1b07c21171cdda9de58a2eddb5cb Mon Sep 17 00:00:00 2001
From: hectahertz <hectahertz@gmail.com>
Date: Thu, 19 Feb 2026 21:08:36 +0100
Subject: [PATCH] fix(lock-release): don't fail on PRs with merge conflicts

---
 .github/workflows/lock-release.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/lock-release.yml b/.github/workflows/lock-release.yml
index 6f284d05b6e..529277325d7 100644
--- a/.github/workflows/lock-release.yml
+++ b/.github/workflows/lock-release.yml
@@ -83,7 +83,9 @@ jobs:
           PR_NUMBERS=$(gh pr list -L 100 -R primer/react --state open --json number,baseRefName,autoMergeRequest,reviewDecision -q '.[] | select(.autoMergeRequest != null) | select(.baseRefName == "main") | select(.reviewDecision == "APPROVED") | .number')
           if [ -n "$PR_NUMBERS" ]; then
             echo "Updating $PR_NUMBERS"
-            echo "$PR_NUMBERS" | xargs -I {} gh pr update-branch -R primer/react {}
+            for pr in $PR_NUMBERS; do
+              gh pr update-branch -R primer/react "$pr" || echo "Warning: failed to update PR #$pr (likely has conflicts)"
+            done
           else
             echo "No PRs to update."
           fi