branch-latest-sync-flow

スター11

フォーク1

更新日2026年4月29日 06:20

Safely sync a base/default branch such as `v1` to the latest upstream state while classifying dirty paths, preserving real user WIP, and reconciling upstream-equivalent residue.

インストール

Codex または Claude でインストールこの Prompt をコピーして Codex、Claude、または他のアシスタントに貼り付けると、Skill ページを確認してインストールできます。

ソース

tts1374

tts1374/infinitas_arena

GitHub リポジトリを開く Creator のリポジトリを見る

ダウンロード

Branch Latest Sync Flow

Overview

Use this skill when the user asks to make a branch such as v1 latest/current with upstream. This flow is for branch synchronization, not for cleanup of arbitrary worktrees or for destructive history rewrites. Return a sync decision and reconciliation artifact, not a generic git troubleshooting narrative.

Inputs

Target branch (default: v1)
Current git state (status, current branch, worktree list)
Upstream branch/ref
Any sticky user constraints about preserving WIP
Whether the target branch is a default/base branch worktree

Workflow

Fetch the upstream target branch.
Classify dirty paths before syncing:
- user WIP
- upstream-equivalent residue
- generated/untracked residue
Measure divergence between local and upstream.
Choose sync strategy:
- fast-forward when possible
- rebase when local commits should be preserved cleanly
- merge only when explicitly appropriate
If temporary stash is needed, use a labeled targeted stash rather than stashing unrelated paths blindly.
Perform the sync.
Reconcile temporary residue/stash:
- restore or clean upstream-equivalent in-scope residue
- preserve explicit user WIP
- record keep/drop disposition for temporary stash entries
Report final branch status and whether the target worktree is clean.

Do not:

replace the caller's ownership of branch policy or WIP preservation decisions
treat procedural completion as success unless final branch/read-back evidence is clear

Output Contract

Always return:

Target branch
Upstream ref
Divergence summary
Dirty-path classification
Sync strategy
Stash actions
Final branch status
Final status

Use this template:

Target branch: <branch>
Upstream ref: <ref>

Divergence summary:
- <summary>

Dirty-path classification:
- user WIP: <paths or "none">
- upstream-equivalent residue: <paths or "none">
- generated/untracked residue: <paths or "none">

Sync strategy:
- <fast-forward|rebase|merge>
- reason: <why>

Stash actions:
- <none or labeled stash + disposition>

Final branch status:
- branch head: <sha>
- worktree status: <clean|dirty>
- residual note: <note or "none">

Final status: <COMPLETE|BLOCKED|ESCALATION>

Rules

Treat v1を最新化 as a sync request that includes fetch and local branch reconciliation.
Do not destroy user-owned WIP.
Do not leave a default/base branch worktree dirty when the remaining paths are only upstream-equivalent residue.
Empty status reporting is not enough; classify why paths are dirty before choosing stash/rebase/merge.
If final status is dirty, explain exactly what was preserved and why.
Do not use destructive reset/checkout unless the user explicitly requests it.
Do not invent extra sync steps when divergence, residue class, and final cleanliness are already proven.

References

references/latest-sync-checklist.md

このリポジトリの他の Skills

同じリポジトリ

commit-pr-flow

tts1374/infinitas_arena

Run a Phase C commit and PR flow from bounded plan items with strict scope control, validation gating, and review-ready output. Use when implementation is done and you need to stage intended files only, verify plan-to-diff alignment, create logical commits, and prepare or open a PR.

2026-05-0911

phase-c-kickoff-flow

tts1374/infinitas_arena

Create Phase C kickoff artifacts before implementation starts. Use when Phase A/B is already decided and Codex needs to restate the source of truth, re-judge execution profile, apply the Spawn Gate, and emit a `delegation execution record` from an Issue, `tasks/*.md`, or, only when concrete task artifacts are not required, an A-lite agreement.

2026-05-0911

phase-c-review-response-flow

tts1374/infinitas_arena

Handle a PR review iteration as a bounded Phase C continuation. Use when Codex receives review URLs or threads and needs to inspect actionable comments, keep scope anchored to the original Issue/task, rerun required validation/audit, and prepare or execute reply/resolve/re-review steps.

2026-05-0911

plan-mode-gate

tts1374/infinitas_arena

Reference skill for execution-profile and Plan Mode decision support. Used by strategy_orchestrator or execution_coordinator to classify `Local-Fast / Standard / High-Risk`, determine whether Plan Mode is required, and emit a Spawn Gate hint before implementation. This skill does not replace stage/routing decisions and does not by itself authorize implementation.

2026-05-0911

quality-check-matrix

tts1374/infinitas_arena

Reference skill for validation-scope selection. Used by orchestrators, implementers, or auditors to map touched areas to the minimum required verification groups from QUALITY.md. This skill does not replace audit/completion decisions and does not by itself declare a task complete.

2026-05-0911

fsm-protocol-guard

tts1374/infinitas_arena

Reference skill for high-risk Room FSM and WebSocket protocol review support. Used by strategy_orchestrator, contract_design_reviewer, contract_auditor, or implementation_auditor to identify high-risk FSM/protocol work, impacted invariants, and required validation. This skill does not replace stage/routing/audit decisions and does not by itself authorize implementation or completion.

2026-04-2911

Branch Latest Sync Flow

Overview

Inputs

Target branch (default: v1)

Current git state (status, current branch, worktree list)

Upstream branch/ref

Any sticky user constraints about preserving WIP

Whether the target branch is a default/base branch worktree

Workflow

Fetch the upstream target branch.

Classify dirty paths before syncing:

user WIP
upstream-equivalent residue
generated/untracked residue

Measure divergence between local and upstream.

Choose sync strategy:

fast-forward when possible
rebase when local commits should be preserved cleanly
merge only when explicitly appropriate

If temporary stash is needed, use a labeled targeted stash rather than stashing unrelated paths blindly.

Perform the sync.

Reconcile temporary residue/stash:

restore or clean upstream-equivalent in-scope residue
preserve explicit user WIP
record keep/drop disposition for temporary stash entries

Report final branch status and whether the target worktree is clean.

Do not:

replace the caller's ownership of branch policy or WIP preservation decisions

treat procedural completion as success unless final branch/read-back evidence is clear

Output Contract

Always return:

Target branch

Upstream ref

Divergence summary

Dirty-path classification

Sync strategy

Stash actions

Final branch status

Final status

Use this template:

Target branch: <branch> Upstream ref: <ref> Divergence summary: - <summary> Dirty-path classification: - user WIP: <paths or "none"> - upstream-equivalent residue: <paths or "none"> - generated/untracked residue: <paths or "none"> Sync strategy: - <fast-forward|rebase|merge> - reason: <why> Stash actions: - <none or labeled stash + disposition> Final branch status: - branch head: <sha> - worktree status: <clean|dirty> - residual note: <note or "none"> Final status: <COMPLETE|BLOCKED|ESCALATION>

Rules

Treat v1を最新化 as a sync request that includes fetch and local branch reconciliation.

Do not destroy user-owned WIP.

Do not leave a default/base branch worktree dirty when the remaining paths are only upstream-equivalent residue.

Empty status reporting is not enough; classify why paths are dirty before choosing stash/rebase/merge.

If final status is dirty, explain exactly what was preserved and why.

Do not use destructive reset/checkout unless the user explicitly requests it.

Do not invent extra sync steps when divergence, residue class, and final cleanliness are already proven.

References

references/latest-sync-checklist.md

name	branch-latest-sync-flow
description	Safely sync a base/default branch such as `v1` to the latest upstream state while classifying dirty paths, preserving real user WIP, and reconciling upstream-equivalent residue.