sneak/pixa
1
0
Fork 0
Code Issues 51 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

TODO.md documents a branch-from-main workflow that no longer matches the next branching model #106

New Issue
Open
opened 2026-08-10 16:14:39 +02:00 by clawbot · 0 comments
clawbot commented 2026-08-10 16:14:39 +02:00
Collaborator
Copy Link

TODO.md's Workflow section still reads:

* branch (from `main`)
...
* merge to `main` if the branch is not protected, otherwise open a PR

As of 2026-08-10 the model is: branch and PR per issue, based on next, squash-merged into next by the manager on a passed review. next is the next-milestone branch and must stay green and mergeable to main without notice; main receives only the single milestone PR, which sneak merges. A contributor following the current TODO.md would cut from main and open a PR against main — exactly the defect the new model exists to prevent.

Definition of done

  • TODO.md's Workflow section describes the next-based model: branch from next, PR based on next, manager squash-merges into next, main only via the milestone PR.
  • The Status section reflects that main is no longer where work lands.
  • Docs-only: zero changes to code, config, scripts, CI or build files.
  • make fmt run and the result committed (prettier, 4-space tabs, proseWrap: always).
  • make check green.

Do NOT reflow the rest of TODO.md — the wholesale markdown reformat is #100 and doing it here would collide with everything in flight. Touch only the lines that are wrong.

`TODO.md`'s Workflow section still reads: ``` * branch (from `main`) ... * merge to `main` if the branch is not protected, otherwise open a PR ``` As of 2026-08-10 the model is: branch and PR **per issue, based on `next`**, squash-merged into `next` by the manager on a passed review. `next` is the next-milestone branch and must stay green and mergeable to `main` without notice; `main` receives only the single milestone PR, which `sneak` merges. A contributor following the current `TODO.md` would cut from `main` and open a PR against `main` — exactly the defect the new model exists to prevent. ## Definition of done - `TODO.md`'s Workflow section describes the `next`-based model: branch from `next`, PR based on `next`, manager squash-merges into `next`, `main` only via the milestone PR. - The Status section reflects that `main` is no longer where work lands. - Docs-only: zero changes to code, config, scripts, CI or build files. - `make fmt` run and the result committed (prettier, 4-space tabs, `proseWrap: always`). - `make check` green. Do NOT reflow the rest of `TODO.md` — the wholesale markdown reformat is https://git.eeqj.de/sneak/pixa/issues/100 and doing it here would collide with everything in flight. Touch only the lines that are wrong.
clawbot added this to the 1.0.0 milestone 2026-08-10 16:14:39 +02:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
merge-ready
needs-checks
needs-rebase
needs-review
needs-rework
No Label
Milestone
No items
No Milestone 1.0.0
Projects
Clear projects
No project
Assignees
Clear assignees
clawbot sneak
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: sneak/pixa#106
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?