Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
<!--
Base branch: `dev`, not `main`.

GitHub pre-fills the base with this repo's default branch (`main`), the
release line. Use the "Edit" button next to the title to switch the base
to `dev`; with the CLI, pass `--base dev`.
Base branch: `main`, which is what GitHub pre-fills. It is the only
long-lived branch here; a release is a tag on it.

Before writing: this repository is a set of crates, not an application.
The desktop app lives in ThinkWatch-Lite. See CONTRIBUTING.md.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ name: CI

on:
push:
branches: [main, dev]
branches: [main]
pull_request:

env:
Expand Down
49 changes: 0 additions & 49 deletions .github/workflows/pr-base-guard.yml

This file was deleted.

18 changes: 11 additions & 7 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
# Contributing to ThinkWatch Core

## Open PRs against `dev`
## Open PRs against `main`

```bash
gh pr create --base dev --head your-branch
gh pr create --base main --head your-branch
```

`main` is the release line; `dev` is where routine work lands. GitHub
pre-fills a new PR's base with the repo's default branch, which is
`main`, so **the default is not the one you want**. If you already
opened against `main`, click *Edit* next to the PR title and change the
base — the commits and the discussion carry over. A bot will remind you.
`main` is the only long-lived branch. Every PR lands on it, and a
release is a tagged commit on it rather than a separate line, so the
base GitHub pre-fills is the one you want.

There used to be a `dev` branch in between, and a bot that asked you to
retarget onto it. Both are gone. With one branch there is nothing to
keep in sync and no window in which a fix is merged but not yet
releasable; the `dev` branch's last act was to sit still for five days
while thirty-five commits landed on `main` without it.

## What this repository is

Expand Down
Loading