decision: should wip commits be kept off main? #521

New issue

Open

opened 2026-09-15 23:55:07 +00:00 by hexajon · 0 comments

hexajon commented

2026-09-15 23:55:07 +00:00

Owner

What happens

Merges are fast-forward only (default_merge_style: fast-forward-only, with squash and merge commits disabled), so every commit on a branch lands on main as it is, checkpoints included.

Commit 147ae9c2, "wip(adr): #483 MADR 4.0.0 tooling build output (pre-fix-round checkpoint)", reached main that way. It then appeared in the v0.19.0 release notes under "Other", because the GoReleaser changelog filters Merge, chore, test, and ci (.goreleaser.yaml:128-132), but not wip.

A checkpoint commit may also not build or pass its tests, which affects git bisect on main.

Open question

A PR check requires every commit on the branch to use an allowed conventional type, so a wip commit must be cleaned up before the merge.
Only add wip to the changelog filter, and leave the history as it is.
Leave it alone.

Acceptance

The decision is recorded, and the chosen behaviour is in place.

## What happens Merges are fast-forward only (`default_merge_style: fast-forward-only`, with squash and merge commits disabled), so every commit on a branch lands on `main` as it is, checkpoints included. Commit 147ae9c2, "wip(adr): #483 MADR 4.0.0 tooling build output (pre-fix-round checkpoint)", reached `main` that way. It then appeared in the v0.19.0 release notes under "Other", because the GoReleaser changelog filters `Merge`, `chore`, `test`, and `ci` (`.goreleaser.yaml:128-132`), but not `wip`. A checkpoint commit may also not build or pass its tests, which affects `git bisect` on `main`. ## Open question 1. A PR check requires every commit on the branch to use an allowed conventional type, so a `wip` commit must be cleaned up before the merge. 2. Only add `wip` to the changelog filter, and leave the history as it is. 3. Leave it alone. ## Acceptance - The decision is recorded, and the chosen behaviour is in place.

hexajon added the

status/needs-decision

label

2026-09-15 23:55:07 +00:00

No milestone

No project

No assignees

1 participant

Notifications

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

sixfold-space/madtea#521

No description provided.

Rows
Columns