Update sync-master-to-dev.yml

Author: mzcydev

.github/workflows/sync-master-to-dev.yml

@@ -1,58 +1,68 @@
 name: Sync master → dev
 
-permissions:
-  contents: write
-
 on:
   push:
     branches:
       - master
 
+permissions:
+  contents: write    # ensure GITHUB_TOKEN can push code
+
 jobs:
   sync-to-dev:
     runs-on: ubuntu-latest
 
     steps:
-      # 1. Check out the full repository (all branches)
+      # 1. Checkout all history and branches
       - name: Checkout repository
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
+          persist-credentials: true
 
-      # 2. Configure Git user for commits
+      # 2. Configure Git user
       - name: Configure Git
         run: |
           git config user.name "github-actions[bot]"
           git config user.email "github-actions[bot]@users.noreply.github.com"
 
-      # 3. Attempt to merge master into dev (or create dev if it doesn't exist)
+      # 3. Fetch and checkout dev properly, then merge master
       - name: Merge master into dev
         id: merge
         run: |
-          # Switch to dev branch, or create it if missing
-          if git show-ref --quiet refs/heads/dev; then
-            git checkout dev
+          # If remote dev exists…
+          if git ls-remote --exit-code --heads origin dev; then
+            # Fetch just the dev branch
+            git fetch origin dev
+            # If we have a local dev, reset it to remote; otherwise create it tracking origin/dev
+            if git show-ref --quiet refs/heads/dev; then
+              git checkout dev
+              git reset --hard origin/dev
+            else
+              git checkout -b dev origin/dev
+            fi
           else
+            # No remote dev yet, branch off master
             git checkout -b dev
           fi
 
-          # Merge origin/master into dev and capture exit code
+          # Merge the latest master in
           git merge origin/master --no-edit
         continue-on-error: true
 
-      # 4. If merge succeeded, push dev back to remote
+      # 4. Push if merge succeeded
       - name: Push changes if merge succeeded
         if: steps.merge.outcome == 'success'
         run: git push origin dev
 
-      # 5. If merge failed (conflicts), open a PR and request reviewers
+      # 5. Open a PR and request review if there were conflicts
       - name: Open Pull Request on conflicts
         if: steps.merge.outcome == 'failure'
         uses: actions/github-script@v6
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
-            // Create a Pull Request from master → dev
+            // 1) Create the PR from master → dev
             const pr = await github.pulls.create({
               owner: context.repo.owner,
               repo: context.repo.repo,
@@ -62,11 +72,10 @@ jobs:
               body: 'Automatic merge from **master** into **dev** failed due to conflicts. Please resolve and merge.',
               draft: false
             });
-
-            // Request review from your team — replace with actual GitHub usernames
+            // 2) Request reviews (replace with your team’s GitHub handles)
             await github.pulls.requestReviewers({
               owner: context.repo.owner,
               repo: context.repo.repo,
               pull_number: pr.data.number,
-              reviewers: ['whynotmax'] //Add more if needed
+              reviewers: ['reviewer1', 'reviewer2']
             });