القائمة
Integrate a merge-ready branch into the trunk — fast-forward check, merge, regenerate backlinks, CHANGELOG, delete branch (local+remote), push with confirmation. TAOM trunk-based, not Git Flow.
التثبيت باستخدام Codex أو Claude انسخ هذا Prompt والصقه في Codex أو Claude أو مساعد آخر ليراجع صفحة Skill ويثبّتها لك.
استنادا إلى تصنيف SOC المهني
Root-cause native Bannerlord CTDs (AccessViolation in TaleWorlds.Native.dll) via Event Log offsets, offline disassembly, and live debugger forensics. No symbols needed.
Dispatch an independent Codex verification job directly via `codex exec` Bash call, then retrieve and present results
Inspect all changed files, group by logical concern, and guide atomic per-concern commits following TAOM's 50/72 rule and commit trailer convention.
Load a snapshot saved by /context-save and present it so this session can pick up where the last one left off without re-deriving decisions.
Launch parallel deep-dive agents to review completed work for quality, standards, compatibility, completeness, and cross-system data flow
Respond to a Bannerlord engine update (Steam force-bump or deliberate migration) — preserve the decompile baseline, regen, diff, re-verify bindings and creature data, control-battle.
Integrate a completed branch into TAOM's trunk (bannerlord-1.4.5, the de-facto master). This is the post-/ship step: /ship gates that a feature is review-clean; this skill does the actual git integration + doc-consistency cleanup that we otherwise run by hand and forget steps in.
Not git-workflow:finish — that's Git Flow (develop/feature/release/hotfix + version tags). TAOM is trunk-based: ephemeral taom-* branches merge into bannerlord-1.4.5, no tagging.
bannerlord-1.4.5./ship (run that first), or work that was committed directly to trunk (no branch to finish).git status --short — working tree must be clean. If dirty, stop and surface (the user may have parallel in-flight work that shouldn't ride along).bannerlord-1.4.5. If $ARGUMENTS names a different base, use it.git log --oneline <base> ^<branch> — empty output = base hasn't advanced past the branch point, so the merge is a clean FF. Non-empty = base moved; it'll be a real merge that may conflict — surface the divergence and preview with git merge --no-commit --no-ff (then git merge --abort) before committing. Never force.git checkout <base> && git merge <branch> — expect "Fast-forward".python tools/build_backlinks.py — the merge may have introduced docs whose ## Referenced by footers drifted.build_backlinks.py also wants to update footers in unrelated docs (parallel-session work), that's not this branch's concern — leave those for the owning workstream. Commit the in-scope footer updates as docs(backlinks): regenerate footers for <area>.git branch -d <branch> — the -d (not -D) refuses if the branch isn't fully merged; that safety is intentional, don't override with -D.git push origin --delete <branch> — only after local delete succeeds (confirms it was merged).bannerlord-1.4.5. It's the becoming-master branch; validate-push.sh warns on master/main pushes. Do not auto-push — surface "ready to push N commits" and wait, unless the user pre-authorized the push for this run.git reset --hard <branch>@{1}); a conflicting real merge needs human eyes. Surface, don't force.build_backlinks.py regenerates the whole tree. After a merge there are often footer updates in docs the branch never touched (another session's lord-skills/bandit work). Don't sweep those into this commit — git add only the docs in the branch's diff.git branch -d as a merge gate: if it refuses, the branch isn't actually merged into the current base — investigate, don't -D..claude/, CLAUDE.md, or AGENTS.md, the pre-commit hook (check-changelog-changed.sh) requires CHANGELOG.md in the post-merge commit set — usually already satisfied by the branch's own CHANGELOG entry..claude/skills/ship/SKILL.md — the pre-merge completion gate this skill follows.tools/build_backlinks.py — step-3 backlink regeneration..claude/hooks/validate-push.sh — the push guard referenced in step 6.