mirror of
https://github.com/heygen-com/hyperframes.git
synced 2026-09-01 19:42:03 +00:00
Vance IngallsandClaude Opus
559dd0e659
Two real conflicts: - docs/guides/prompting.mdx: modify/delete. This branch already deleted it (383dd3568, replaced by the docs/prompting/* multi-page structure); main separately fixed one line in the old file (cf7c1d760: lint+validate -> the new consolidated `check` command). Kept the deletion — a redirect to /prompting/overview already exists in docs.json — and ported the same check-command fix forward into the two new-structure pages that still had the stale lint+validate phrasing (examples.mdx, rules-and-anti-patterns.mdx), so main's fix isn't lost. - skills-manifest.json: auto-generated, regenerated fresh via packages/cli/scripts/gen-skills-manifest.ts rather than hand-resolving the JSON conflict markers. Everything else auto-merged cleanly (no conflicts) — this pulls in main's independent work since the branch diverged (media-use v2, the check command consolidation, studio timeline updates, etc). Co-Authored-By: Claude Opus <noreply@anthropic.com>