From 704a46f459b7925e0bd5baae36a9e505835ffa8f Mon Sep 17 00:00:00 2001
From: Kurdistan Tech Ministry <info@pezkuwichain.io>
Date: Mon, 2 Mar 2026 15:09:11 +0300
Subject: [PATCH] Fix auto-pr to not fail when branches are already in sync

---
 .github/workflows/auto-pr.yml | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml
index 79d9991..2fce8e7 100644
--- a/.github/workflows/auto-pr.yml
+++ b/.github/workflows/auto-pr.yml
@@ -18,17 +18,23 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
+          # Check if there's already an open PR from master to main
           EXISTING_PR=$(gh pr list --base main --head master --state open --json number --jq '.[0].number')
 
           if [ -n "$EXISTING_PR" ]; then
             echo "PR #$EXISTING_PR already exists — new commits will appear automatically"
-          else
-            echo "Creating new PR: master → main"
-            gh pr create \
-              --base main \
-              --head master \
-              --title "Sync: master → main" \
-              --body "Automated PR to sync master branch changes to main.
-
-          This PR was created automatically and will be merged once CI checks pass."
+            exit 0
+          fi
+
+          echo "Creating new PR: master → main"
+          if gh pr create \
+            --base main \
+            --head master \
+            --title "Sync: master → main" \
+            --body "Automated PR to sync master branch changes to main.
+
+          This PR was created automatically and will be merged once CI checks pass."; then
+            echo "PR created successfully"
+          else
+            echo "PR creation skipped (branches may already be in sync)"
           fi