[docs] Update documentation for features from 2026-09-01

[github-actions]

Documentation Updates - 2026-09-01

This PR updates the documentation based on user-facing changes merged in the last 24 hours.

Features Documented

• Conflict-marker verification in the merge-conflict resolution skill flow (from [evoskill] Refine resolve-merge-conflicts skill: detect leftover conflict markers #57601)

📝 Detailed Changes & References

Changes Made

• Updated docs/src/content/docs/gallery/maintaining-repos.md to explain how maintenance workflows can use ./.github/skills/resolve-merge-conflicts/resolve.sh origin/main
• Documented the early conflict-marker check for leftover <<<<<<< and ||||||| base (original) lines in workflow markdown
• Added guidance to prefer lock-file regeneration over manual edits during merge resolution

Merged PRs Referenced

• [evoskill] Refine resolve-merge-conflicts skill: detect leftover conflict markers #57601 - Refine resolve-merge-conflicts skill: detect leftover conflict markers

Analysis Notes

• GitHub read commands via gh returned 401 Bad credentials, so this run used local git history for the last-24h change scan instead of remote PR metadata
• The requested .github/instructions/documentation.instructions.md file is not present in this checkout, so the update followed .github/skills/documentation/SKILL.md
• AI dictionary alignment summary: terms reviewed: model, context, tools, memory, steering; terms adopted: none newly introduced; conflicts resolved: none

Skipped Issues

• Open/recent documentation issue review could not be completed because gh issue list failed with 401 Bad credentials

Notes

• No top-level README.md or docs/src/content/docs/index.mdx changes were made
• The update is intentionally small and scoped to the newly added merge-conflict workflow behavior

Generated by 📝 Daily Documentation Updater · pi · gpt54 · 29.9 AIC · ⌖ 14.2 AIC · ⊞ 10.2K · ◷

• expires on Sep 2, 2026, 2:48 AM UTC-08:00

[gh-aw-bot]

@copilot This PR looks ready for a forward-progress pass. Please review the current status checks, refresh the branch if needed, and run the pr-finisher skill to move it toward merge readiness.

Generated by 👨🍳 PR Sous Chef
_{Comment /souschef to run again}

Generated by 👨‍🍳 PR Sous Chef · pi · gpt54 · 23.3 AIC · ⌖ 8.74 AIC · ⊞ 8.9K · ◷
_{Comment /souschef to run again}