From d6e8ee47841593075b5e66da1cc4fd55fc55beec Mon Sep 17 00:00:00 2001
From: LukeGus <bugattiguy527@gmail.com>
Date: Wed, 19 Aug 2026 15:54:06 -0500
Subject: [PATCH] fix: stop the release from resetting the docs branch and
 losing hand-written pages

---
 .github/workflows/release.yml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6387f2ff..f59c5a98 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -443,7 +443,14 @@ jobs:
 
       - name: Create docs release branch
         working-directory: docs-repo
-        run: git checkout -B "dev-${{ needs.prep.outputs.version }}"
+        run: |
+          BRANCH="dev-${{ needs.prep.outputs.version }}"
+          if git ls-remote --exit-code origin "refs/heads/$BRANCH" >/dev/null 2>&1; then
+            echo "Reusing existing docs branch $BRANCH."
+            git checkout -B "$BRANCH" "origin/$BRANCH"
+          else
+            git checkout -B "$BRANCH"
+          fi
 
       - name: Overwrite OpenAPI spec and regenerate API docs
         working-directory: docs-repo
@@ -472,7 +479,7 @@ jobs:
 
           git add -A
           git commit -m "feat: update API docs for ${{ needs.prep.outputs.version }}"
-          git push --force origin "dev-${{ needs.prep.outputs.version }}"
+          git push origin "dev-${{ needs.prep.outputs.version }}"
 
       - name: Open and squash-merge docs PR
         if: ${{ inputs.mode != 'Dry run' }}
@@ -535,7 +542,7 @@ jobs:
         docs,
         publish-youtube,
       ]
-    if: ${{ always() && (inputs.mode == 'Everything' || inputs.mode == 'Skip submit') && needs.merge-to-main.result == 'success' && needs.electron-release.result == 'success' }}
+    if: ${{ always() && (inputs.mode == 'Everything' || inputs.mode == 'Skip submit') && needs.merge-to-main.result == 'success' && needs.docs.result == 'success' }}
     runs-on: blacksmith-2vcpu-ubuntu-2404
     steps:
       - name: Checkout repository