docs(polecat): remove push instructions for local-only branches (gt-cqw0n)
Phase 3 of heresy correction: polecat branches stay local, Refinery accesses them via shared .repo.git. Changes: - templates/polecat-CLAUDE.md: Remove push from completion checklist - mol-polecat-work.formula.toml: Remove push step from cleanup-workspace - polecat.md.tmpl: Update landing rule for local branches - refinery.md.tmpl: Change origin/polecat to local branch references 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
committed by
Steve Yegge
parent
63af29284b
commit
ac4649ba7d
@@ -362,20 +362,14 @@ Should be empty. If not:
|
||||
- Pop and commit: `git stash pop && git add -A && git commit`
|
||||
- Or drop if garbage: `git stash drop`
|
||||
|
||||
**4. Push your branch:**
|
||||
```bash
|
||||
git push -u origin $(git branch --show-current)
|
||||
```
|
||||
|
||||
**5. Verify nothing left behind:**
|
||||
**4. Verify nothing left behind:**
|
||||
```bash
|
||||
git status # Clean
|
||||
git stash list # Empty
|
||||
git log origin/main..HEAD # Your commits
|
||||
git diff origin/main...HEAD # Your changes (expected)
|
||||
git log origin/main..HEAD # Your commits (local only, not pushed)
|
||||
```
|
||||
|
||||
**Exit criteria:** Branch pushed, workspace clean, no cruft."""
|
||||
**Exit criteria:** Workspace clean, commits ready for Refinery."""
|
||||
|
||||
[[steps]]
|
||||
id = "prepare-for-review"
|
||||
@@ -442,7 +436,7 @@ You should see output like:
|
||||
|
||||
**3. You're recyclable:**
|
||||
Your work is in the queue. The Witness knows you're done.
|
||||
Your sandbox can be cleaned up - all work is pushed to origin.
|
||||
Refinery will access your local branch via shared .repo.git.
|
||||
|
||||
If you have context remaining, you may:
|
||||
- Pick up new work from `bd ready`
|
||||
|
||||
@@ -226,14 +226,14 @@ and submits your branch to the merge queue. The Witness handles the rest.
|
||||
|
||||
> **Work is NOT landed until it's on `main` OR in the Refinery MQ.**
|
||||
|
||||
Your branch sitting on origin is NOT landed. You must run `gt done` to submit it
|
||||
to the merge queue. Without this step:
|
||||
Your local branch is NOT landed. You must run `gt done` to submit it to the
|
||||
merge queue. Without this step:
|
||||
- Your work is invisible to other agents
|
||||
- The branch will go stale as main diverges
|
||||
- Merge conflicts will compound over time
|
||||
- Work can be lost if your polecat is recycled
|
||||
|
||||
**Branch → `gt done` → MR in queue → Refinery merges → LANDED**
|
||||
**Local branch → `gt done` → MR in queue → Refinery merges → LANDED**
|
||||
|
||||
## If You're Stuck
|
||||
|
||||
|
||||
@@ -225,7 +225,7 @@ If queue empty, skip to context-check step.
|
||||
|
||||
**process-branch**: Pick next branch, rebase on main
|
||||
```bash
|
||||
git checkout -b temp origin/polecat/<worker>
|
||||
git checkout -b temp polecat/<worker> # Local branch (shared via .repo.git)
|
||||
git rebase origin/{{ .DefaultBranch }}
|
||||
```
|
||||
If conflicts unresolvable: notify polecat, skip to loop-check.
|
||||
@@ -255,7 +255,7 @@ git checkout {{ .DefaultBranch }}
|
||||
git merge --ff-only temp
|
||||
git push origin {{ .DefaultBranch }}
|
||||
git branch -d temp
|
||||
git push origin --delete polecat/<worker>
|
||||
git branch -d polecat/<worker> # Delete local polecat branch
|
||||
```
|
||||
|
||||
**loop-check**: More branches? Return to process-branch.
|
||||
|
||||
@@ -106,7 +106,6 @@ bd close <step-id> # Mark step complete
|
||||
git status # Check working tree
|
||||
git add <files> # Stage changes
|
||||
git commit -m "msg (issue)" # Commit with issue reference
|
||||
git push # Push your branch
|
||||
```
|
||||
|
||||
### Communication
|
||||
@@ -149,15 +148,13 @@ When your work is done, follow this EXACT checklist:
|
||||
|
||||
```
|
||||
[ ] 1. Tests pass: go test ./...
|
||||
[ ] 2. COMMIT changes: git add <files> && git commit -m "msg (issue-id)"
|
||||
[ ] 3. Push branch: git push -u origin HEAD
|
||||
[ ] 4. Close issue: bd close <issue> --reason "..."
|
||||
[ ] 5. Sync beads: bd sync
|
||||
[ ] 6. Exit session: gt done --exit
|
||||
[ ] 2. Commit changes: git add <files> && git commit -m "msg (issue-id)"
|
||||
[ ] 3. Sync beads: bd sync
|
||||
[ ] 4. Exit session: gt done --exit
|
||||
```
|
||||
|
||||
**CRITICAL**: You MUST commit and push BEFORE running `gt done --exit`.
|
||||
If you skip the commit, your work will be lost!
|
||||
**Note**: No push needed - your branch stays local. Refinery accesses it
|
||||
via shared .repo.git and merges to main.
|
||||
|
||||
The `gt done --exit` command:
|
||||
- Creates a merge request bead
|
||||
@@ -169,14 +166,14 @@ The `gt done --exit` command:
|
||||
|
||||
> **Work is NOT landed until it's on `main` OR in the Refinery MQ.**
|
||||
|
||||
Your branch sitting on origin is NOT landed. You must run `gt done` to submit it
|
||||
to the merge queue. Without this step:
|
||||
Your local branch is NOT landed. You must run `gt done` to submit it to the
|
||||
merge queue. Without this step:
|
||||
- Your work is invisible to other agents
|
||||
- The branch will go stale as main diverges
|
||||
- Merge conflicts will compound over time
|
||||
- Work can be lost if your polecat is recycled
|
||||
|
||||
**Branch → `gt done` → MR in queue → Refinery merges → LANDED**
|
||||
**Local branch → `gt done` → MR in queue → Refinery merges → LANDED**
|
||||
|
||||
---
|
||||
|
||||
|
||||
Reference in New Issue
Block a user