From c79e4c2bcb2b6208fc67bd8f27d598fc16fe948b Mon Sep 17 00:00:00 2001
From: Youssef Aitousarrah <youssef.aitousarrah@gmail.com>
Date: Wed, 8 Apr 2026 10:49:45 -0700
Subject: [PATCH] fix(iterate-workflow): safer push logic with force-with-lease
 and rebase

---
 .github/workflows/iterate.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/iterate.yml b/.github/workflows/iterate.yml
index 2939132e..2196de67 100644
--- a/.github/workflows/iterate.yml
+++ b/.github/workflows/iterate.yml
@@ -87,8 +87,9 @@ jobs:
             --jq '.[0].number // empty')
 
           if [ -n "$EXISTING_PR" ]; then
-            git push origin HEAD:"$BRANCH" --force-with-lease 2>/dev/null || \
-              git push origin HEAD:"$BRANCH"
+            git fetch origin "$BRANCH" 2>/dev/null || true
+            git pull --rebase origin main
+            git push origin HEAD:"$BRANCH" --force-with-lease
             {
               cat docs/iterations/LEARNINGS.md
               echo ""
@@ -99,7 +100,7 @@ jobs:
             echo "Updated existing PR #${EXISTING_PR}"
           else
             git checkout -b "$BRANCH" 2>/dev/null || git checkout "$BRANCH"
-            git push -u origin "$BRANCH"
+            git push -u origin "$BRANCH" --force-with-lease
             {
               cat docs/iterations/LEARNINGS.md
               echo ""