sysadminandClaude Opus 4.8
f464716e89
Add runbook guidance for deleting throwaway _encode/_emit/_inline commit helpers after MCP commit attempts, ignore those patterns in .gitignore, and cross-link the worktree-cleanup template. Closes #261. Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]>
31 lines
1.5 KiB
Markdown
31 lines
1.5 KiB
Markdown
# Template: clean up after merge
|
|
|
|
Copy, fill the `<...>` fields, and paste as the task prompt. Only run AFTER a
|
|
real merge is confirmed on remote master.
|
|
|
|
```text
|
|
Task: clean up branch/worktree for PR #<pr> / issue #<n> after merge.
|
|
|
|
Rules (llm-project-workflow):
|
|
- Do NOT clean up until the merge is confirmed on <remote>/master.
|
|
- Cleanup would-delete-unmerged-work → STOP. Never --force-remove a dirty tree.
|
|
|
|
Steps:
|
|
1. git fetch <remote> --prune
|
|
2. Confirm <remote>/master contains the merge of PR #<pr>
|
|
(git log <remote>/master | grep the merge, or git branch -r --contains <sha>).
|
|
If not merged → STOP; run the recovery template instead.
|
|
3. Close issue #<n> if not auto-closed; remove the status:in-progress label.
|
|
4. scripts/worktree-clean --delete-branch <type>/issue-<n>-<slug>
|
|
(removes branches/<type>-issue-<n>-<slug>; refuses if dirty; git branch -d is
|
|
safe-delete only — fails on unmerged.)
|
|
5. Delete the remote branch if the merge did not already remove it.
|
|
5b. Delete any throwaway agent helpers (`_encode_*.py`, `_emit_*.py`, `_inline_*.py`)
|
|
left in the author worktree (see docs/llm-workflow-runbooks.md § Agent temp artifact cleanup).
|
|
6. From the main checkout: git fetch <remote> --prune; git checkout master;
|
|
git reset --hard <remote>/master ONLY if local master safely matches remote.
|
|
7. Confirm main checkout clean and current (git status; 0 0 vs <remote>/master).
|
|
|
|
Handoff: merge confirmed, issue closed, branch+worktree removed, checkout clean.
|
|
```
|