Agent Skills: rewrite-branch-merge

Manage rewrite branches: when to branch, how to compare, and how to merge back with minimal chaos.

UncategorizedID: aevatarAI/aevatar-agent-framework/rewrite-branch-merge

Install this agent skill to your local

pnpm dlx add-skill https://github.com/aevatarAI/aevatar-agent-framework/tree/HEAD/experimental/novel/agent_skills/rewrite-branch-merge

Skill Files

Browse the full folder contents for rewrite-branch-merge.

Download Skill

Loading file tree…

experimental/novel/agent_skills/rewrite-branch-merge/SKILL.md

Skill Metadata

Name
rewrite-branch-merge
Description
Manage rewrite branches: when to branch, how to compare, and how to merge back with minimal chaos.

When to use

  • A change is risky (canon/timeline/payoff) and might break the mainline.
  • Author wants to explore multiple routes in parallel.

Branching rules (simple, strict)

  • Branch if:
    • canon changes would require editing many existing chapters
    • timeline constraints are violated and fix is non-local
    • payoff plan changes the story’s core promise

Comparison checklist

  • Narrative Tests: pass/fail delta
  • Setup/Payoff ledger: debt ratio, broken setups
  • Reader personas: confusion / payoff strength delta
  • Author intent: does this branch align better with the deviation intent?

Merge strategies

  • Pick winner: choose one branch entirely (fast)
  • Selective merge: pick best chapters/sections (requires strong diff discipline)
  • Dual timeline: keep both as alternate route (rare; only if author wants)

Output

  • branch_compare.md (diff summary + test/persona/ledger comparison)
  • merge_plan.md (chosen strategy + concrete steps)