added new 4

Author: petermsouzajr

.github/workflows/sync-demo-branch.yml

@@ -9,13 +9,13 @@ jobs:
   sync-demo-branch:
     runs-on: ubuntu-latest
     steps:
-      # Checkout the demo branch first, this is where we'll merge into
+      # *** CHANGE HERE: Revert to v3 for testing ***
       - name: Checkout demo branch
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3 # Reverted for testing
         with:
           ref: 'demo'
           token: ${{ secrets.DEMO_UPDATE_PAT }}
-          fetch-depth: 0 # Needed for merge history
+          fetch-depth: 0 # Still needed
 
       # Verify .gitattributes
       - name: Verify .gitattributes
@@ -29,19 +29,19 @@ jobs:
           git config user.name "GitHub Actions Bot"
           git config user.email "actions-bot@github.com"
 
-      # Disable autocrlf
+      # Disable autocrlf (keep this for now, doesn't hurt)
       - name: Disable autocrlf
         run: git config --global core.autocrlf false
 
       # Fetch the latest changes from the remote, including main
       - name: Fetch origin
         run: git fetch origin
 
-      # Perform the merge from main into demo
-      - name: Merge main into demo TEST without -X theirs
+      # Perform the merge from main into demo (Relying on .gitattributes)
+      - name: Merge main into demo (using .gitattributes)
         run: |
-          # TEST: Removed -X theirs to see if .gitattributes merge=ours works alone
-          git merge --no-ff origin/main -m "Auto-merge main into demo (TEST: without -X theirs)"
+          # Relying on .gitattributes to handle demo-specific folders
+          git merge --no-ff origin/main -m "Auto-merge main into demo"
 
       # Push the merge commit (and resolved changes) back to the demo branch
       - name: Push changes to demo