chore: update plan to perform full upstream sync

Co-authored-by: animesh-garg <1613964+animesh-garg@users.noreply.github.com>

Author: Copilot

.github/workflows/sync-upstream.yml

@@ -27,5 +27,9 @@ jobs:
           git remote add upstream https://github.com/alshedivat/al-folio.git
           git fetch upstream main
           git checkout main
-          git merge --no-edit upstream/main
+          upstream_sha="$(git rev-parse --short upstream/main)"
+          if ! git merge upstream/main -m "Merge upstream al-folio main (${upstream_sha})"; then
+            echo "Merge conflict detected while syncing with upstream/main. Resolve conflicts manually."
+            exit 1
+          fi
           git push origin main