Skip to content

chore: make main the branch the contract describes - #52

Merged
fylorn merged 1 commit into
mainfrom
chore/pr-base-is-main
Sep 20, 2026
Merged

fylorn merged 1 commit into
mainfrom
chore/pr-base-is-main

Conversation

@fylorn

@fylorn fylorn commented Sep 20, 2026

Copy link
Copy Markdown
Contributor

Every pull request since 17 September has been opened against main and merged
there, and dev has not moved since 15 September — by the time v0.9.1 was
tagged it was thirty-five commits behind. The documents still described the
opposite: CONTRIBUTING.md and the pull request template told contributors to
retarget onto dev, and pr-base-guard.yml commented on every PR to say the
base was wrong when it was in fact the one being used.

With one person merging and a tag per release, the second branch never bought
anything: it carried the same commits a day later, and the only thing it
produced was a bot arguing with the actual workflow on every pull request.

  • CONTRIBUTING.md: PRs open against main; says what happened to dev.
  • .github/PULL_REQUEST_TEMPLATE.md: the pre-filled base is the right one.
  • .github/workflows/pr-base-guard.yml: deleted.
  • .github/workflows/ci.yml: stops watching pushes to a branch that is going
    away.

The dev branch itself is deleted separately. Its two commits are the
pre-squash originals of #15 and #16, both already on main.

🤖 Generated with Claude Code

Every pull request since 17 September has been opened against `main` and
merged there, and `dev` has not moved since 15 September — by the time
v0.9.1 was tagged it was thirty-five commits behind. The documents still
described the opposite: CONTRIBUTING and the pull request template told
contributors to retarget onto `dev`, and a workflow commented on every
PR to say the base was wrong when it was in fact the one being used.

With one person merging and a tag per release, the second branch never
bought anything. It carried the same commits a day later, and the only
thing it produced was a bot arguing with the actual workflow on every
pull request.

So `main` is the contract now: PRs open against it, releases are tags on
it. The retarget workflow is gone, CI no longer watches a branch that
does not exist, and the pull request template says the pre-filled base
is the right one.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
@github-actions

Copy link
Copy Markdown

Thanks for the PR. One thing before review: this targets main, and it should target dev.

main is a release-only line — branch-protected, linear history, and every commit on it is a tagged release snapshot. Routine work lands on dev and reaches main with the next release. GitHub pre-filled main here because it is the default branch, so this is our defaults being unhelpful rather than anything you did wrong.

No need to close and reopen: click Edit next to the PR title and change the base branch to dev. The commits and the discussion carry over.

See CONTRIBUTING.md and CONTRIBUTING.md for the branch contract.

@fylorn
fylorn merged commit 1cb5359 into main Sep 20, 2026
2 checks passed
@fylorn
fylorn deleted the chore/pr-base-is-main branch September 20, 2026 04:21
@fylorn fylorn mentioned this pull request Sep 20, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant