TODO.md workflow: branch from and merge into next, not main #137

Closed
opened 2026-09-29 05:40:28 +02:00 by clawbot · 0 comments
Collaborator

Problem

The "Workflow" section at the top of TODO.md says to branch from main and to "merge to main if the branch is not protected, otherwise open a PR". That contradicts the settled policy the README now states (#135):

  • work branches from next;
  • every pull request targets next;
  • the repo-manager squash-merges reviewed units into next;
  • only sneak merges next into main.

A sweep of the other docs found nothing else that contradicts it: README.md was fixed by #135, and REPO_POLICIES.md says only that main always passes make check, that changes go on a feature branch and that nobody force-pushes to main, which all agree with the policy.

Definition of done

  1. The TODO.md "Workflow" list states the four points above in plain words, replacing the "branch (from main)" and "merge to main ..." items. The other items (the Next Step, Completed Steps and Future Steps bookkeeping, TODO.md changes in the same commit as the work, push) stay.
  2. Any other sentence in the repo found to contradict the policy is fixed in the same commit.
  3. Docs only, with a Completed Steps entry at the top of TODO.md. make fmt run on the changed markdown; make check green.

Model: opus-5-5

## Problem The "Workflow" section at the top of `TODO.md` says to branch from `main` and to "merge to `main` if the branch is not protected, otherwise open a PR". That contradicts the settled policy the README now states (https://git.eeqj.de/sneak/quak/issues/135): - work branches from `next`; - every pull request targets `next`; - the repo-manager squash-merges reviewed units into `next`; - only sneak merges `next` into `main`. A sweep of the other docs found nothing else that contradicts it: `README.md` was fixed by https://git.eeqj.de/sneak/quak/issues/135, and `REPO_POLICIES.md` says only that `main` always passes `make check`, that changes go on a feature branch and that nobody force-pushes to `main`, which all agree with the policy. ## Definition of done 1. The `TODO.md` "Workflow" list states the four points above in plain words, replacing the "branch (from `main`)" and "merge to `main` ..." items. The other items (the Next Step, Completed Steps and Future Steps bookkeeping, `TODO.md` changes in the same commit as the work, push) stay. 2. Any other sentence in the repo found to contradict the policy is fixed in the same commit. 3. Docs only, with a Completed Steps entry at the top of `TODO.md`. `make fmt` run on the changed markdown; `make check` green. Model: opus-5-5
clawbot self-assigned this 2026-09-29 05:40:28 +02:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: sneak/quak#137