ci: fix reviewed dashboard merge conflict inventory

Author: TheHiddenObserver

.github/workflows/_temporary-sync-dashboard-master.yml

@@ -42,14 +42,14 @@ jobs:
           set -e
 
           if [[ "$merge_status" -ne 1 ]]; then
-            echo "Expected a five-path conflict set; git merge returned $merge_status" >&2
+            echo "Expected a reviewed three-path textual conflict set; git merge returned $merge_status" >&2
             exit 1
           fi
 
+          # Five paths changed on both sides, but Git can merge .gitignore and
+          # docs/en/README.md cleanly. Assert only the three actual unmerged paths.
           expected_conflicts=$(cat <<'EOF'
-          .gitignore
           docs/cn/guides/benchmarks.md
-          docs/en/README.md
           docs/en/guides/benchmarks.md
           pyproject.toml
           EOF
@@ -64,12 +64,13 @@ jobs:
             exit 1
           fi
 
-          # Keep current master packaging/navigation, then add the reviewed
-          # dashboard-specific deltas. Keep PR #76's benchmark guides because
-          # they remove stale universal performance claims and add the current
-          # canonical-dashboard contract.
-          git checkout --theirs .gitignore docs/en/README.md pyproject.toml
-          git checkout --ours docs/en/guides/benchmarks.md docs/cn/guides/benchmarks.md
+          # Resolve all five overlapping paths from explicit source commits,
+          # independent of whether Git marked a path conflicted or auto-merged it.
+          git show "$master_head:.gitignore" > .gitignore
+          git show "$master_head:docs/en/README.md" > docs/en/README.md
+          git show "$master_head:pyproject.toml" > pyproject.toml
+          git show "$dashboard_head:docs/en/guides/benchmarks.md" > docs/en/guides/benchmarks.md
+          git show "$dashboard_head:docs/cn/guides/benchmarks.md" > docs/cn/guides/benchmarks.md
 
           python - <<'PY'
           from pathlib import Path