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>
Splits guides/prompting into a Prompt Guide nav group (overview + Fundamentals
+ Making it look good, 11 pages) with a redirect from the old URL. Applies
research-validated upgrades: beat content formula, before/after prompt rewrites
with engine rationale, single-variable iteration moves, absolute-target
calibration, camera/depth/pacing vocabulary, prerequisites gate.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Miguel Ángel