added new 8

Author: petermsouzajr

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

@@ -1,4 +1,5 @@
-name: Sync Demo Branch
+# Workflow from the previous step - attempting merge and resolving conflicts
+name: Sync Demo Branch (Merge & Resolve)
 
 on:
   push:
@@ -9,25 +10,15 @@ jobs:
   sync-demo-branch:
     runs-on: ubuntu-latest
     steps:
-      # Use v4
+      # Checkout demo branch
       - name: Checkout demo branch
         uses: actions/checkout@v4
         with:
           ref: 'demo'
           token: ${{ secrets.DEMO_UPDATE_PAT }}
-          fetch-depth: 0
+          fetch-depth: 0 # Needed for merge
 
-      # Verify .gitattributes
-      - name: Verify .gitattributes
-        run: |
-          echo "Checking .gitattributes content:"
-          cat .gitattributes || echo ".gitattributes not found!"
-
-      # Check Git Version
-      - name: Check Git Version
-        run: git --version
-
-      # Configure Git user for the commit
+      # Configure Git User
       - name: Configure Git User
         run: |
           git config user.name "GitHub Actions Bot"
@@ -37,64 +28,51 @@ jobs:
       - name: Disable autocrlf
         run: git config --global core.autocrlf false
 
-      # Fetch the latest changes from the remote, including main
+      # Fetch origin
       - name: Fetch origin
         run: git fetch origin
 
-      # Attempt the merge using -X ours, allow failure
+      # Attempt Merge
       - name: Attempt Merge main into demo using -X ours
-        id: merge_attempt # Give the step an ID
+        id: merge_attempt
         run: |
           echo "Attempting merge with: git merge --no-ff -X ours origin/main"
-          # Use a standard merge message here, we might amend it later if needed
           git merge --no-ff -X ours origin/main -m "Auto-merge main into demo"
         continue-on-error: true
 
-      # *** NEW: Resolve conflicts by keeping 'ours' if merge failed ***
+      # Resolve Conflicts Favoring 'ours'
       - name: Resolve Conflicts Favoring 'ours'
-        # Run only if the previous merge step failed
         if: steps.merge_attempt.outcome == 'failure'
         run: |
           echo "Merge failed, attempting to resolve conflicts favouring 'ours'..."
-          # Get list of unmerged files (conflicts)
           git diff --name-only --diff-filter=U > conflicted_files.txt
-
           if [ -s conflicted_files.txt ]; then
             echo "Conflicting files found:"
             cat conflicted_files.txt
-            # For each conflicting file, checkout the version from 'ours' (demo branch)
-            # Use xargs to handle the list of files efficiently
             echo "Checking out 'ours' version for conflicting files..."
             xargs -r -a conflicted_files.txt git checkout --ours --
-            # Add the now-resolved files to the index
             echo "Adding resolved files..."
             xargs -r -a conflicted_files.txt git add --
-            # Commit the resolved merge
             echo "Committing resolved merge..."
-            # You can use a specific message or potentially amend the failed merge commit
-            # Using a new message for clarity:
             git commit -m "Auto-merge main into demo (Conflicts resolved favoring demo)"
             echo "Conflicts resolved and committed."
           else
-            echo "Merge failed, but no conflicting files found by 'git diff --diff-filter=U'. This is unexpected."
-            # Explicitly fail the job if merge failed but we couldn't find/resolve conflicts
+            echo "Merge failed, but no conflicting files found by 'git diff --diff-filter=U'. Aborting."
             exit 1
           fi
 
-      # Check final status ONLY IF the resolution step ran (i.e., merge initially failed)
-      # This is mostly for logging/debugging if the resolution itself failed.
+      # Check Status After Resolution Attempt (Safety Check)
       - name: Check Status After Resolution Attempt
         if: steps.merge_attempt.outcome == 'failure'
         run: |
           echo "--- Git Status after conflict resolution attempt ---"
           git status --short
-          # Check again for unmerged files. If any exist here, the resolution failed.
           if git diff --name-only --diff-filter=U | read; then
             echo "ERROR: Unmerged files still exist after resolution attempt!"
             exit 1
           fi
 
-      # Push the changes (either the successful initial merge or the resolved merge)
+      # Push changes to demo (no force needed)
       - name: Push changes to demo
         run: |
           echo "Pushing changes to demo..."