rewrite-branch-merge

스타12

포크10

업데이트2026년 1월 15일 09:23

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

설치

Codex 또는 Claude로 설치 이 Prompt를 복사해 Codex, Claude 또는 다른 어시스턴트에 붙여 넣으면 Skill 페이지를 검토하고 설치를 진행할 수 있습니다.

출처

aevatarAI

aevatarAI/aevatar-agent-framework

GitHub 저장소 열기 Creator 저장소 보기

다운로드

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)

이 저장소의 다른 Skills

같은 저장소

canon-governance

aevatarAI/aevatar-agent-framework

Govern canon changes: require explicit reason/impact/retroactive policy, and produce an actionable propagation plan.

2026-01-1512

deviation-impact-analysis

aevatarAI/aevatar-agent-framework

Turn "AI draft -> author edits" diffs into structured deviation items, an author-intent prompt, and a concrete propagation plan.

2026-01-1512

narrative-tests

aevatarAI/aevatar-agent-framework

Help the author write narrative unit tests (rules/constraints) and interpret failures with a concrete fix roadmap.

2026-01-1512

reader-personas

aevatarAI/aevatar-agent-framework

Simulate multiple reader personas to score a chapter (爽点/困惑/信息负荷) and propose actionable alternatives.

2026-01-1512

setup-payoff-ledger

aevatarAI/aevatar-agent-framework

Maintain a structured Setup/Payoff ledger (promises, debts, payoffs) and generate a payoff roadmap.

2026-01-1512

story-control-panel

aevatarAI/aevatar-agent-framework

Define what the Story Control Panel shows, how to compute signals, and how the author should act on alerts.

2026-01-1512

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)