DashboardcraftCraft PR workflow: branch/cherry-pick/n…

Craft PR workflow: branch/cherry-pick/notes; amend pre-push, new commit once pushed

Category: pattern
Confidence: 0.80
ID: 019f8997-6822-757e-ac6f-edcfa32270b8
Project ID: e16af391-c497-4837-b681-c849a5514499
Cross-project: No
Recalled in other projects: 2
Source session: (none)
Created: 2026-06-10 21:07:09
Updated: 2026-07-22 11:30:29

Cross-Project Recalls

ProjectHitsLast recalled
opencode-lore 2 28d ago
Code 1 2026-07-01

Content

Branch naming: {user}/{type}/{description}. From a feature-branch worktree, create fix branches off master: git checkout -b fix/name --track origin/master, then git cherry-pick <commit>. Commit titles follow conventional commits: fix:, feat:, refactor:, meta:, docs:. When adversarial-review fixes surface as uncommitted working-tree changes on top of a NOT-YET-PUSHED commit, amend them in (git commit --amend) to keep history coherent. Once a branch is already pushed and under active review (e.g. Bugbot/reviewers have commented on specific lines), push follow-up fixes as a NEW commit instead of amending — amending would orphan/hide the reviewed diff and break comment threading (done in PR #848, commit 42d17f0 on top of already-pushed 4e2d8f4). Attach plans as git notes (git notes add -m ..., push via git push origin refs/notes/commits). Create draft PRs with gh pr create --draft.

Move to: