Skip to content

docs: clarify required-context count + document solo-owner admin-merge policy #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
constk merged 1 commit into from
May 2, 2026
Merged

docs: clarify required-context count + document solo-owner admin-merge policy #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 14 additions & 2 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ main ◄── release PR ◄── develop ◄── feat/123-short-name
◄── chore/125-config-change
```

- `main` is the release line. Protected: 15 required status checks, code-owner approval, no force pushes.
- `develop` is the integration branch. Same gates, less strict (PRs don't need rebases).
- `main` is the release line. Protected: **21 required status checks**, code-owner approval, no force pushes. (One additional non-required check, `Draft next release` from release-drafter, runs informationally on PRs to `main` and shows up in the rollup but is not gated.)
- `develop` is the integration branch. Same 21 gates, less strict (PRs don't need rebases).
- Feature branches are short-lived and named `<type>/<issue-number>-<kebab-title>`. Open one issue per branch so the project board stays usable.

## Commit messages
Expand Down Expand Up @@ -43,6 +43,18 @@ The subject is **lowercase** after the colon. Title Case prose (`Add the thing`)
- **Screenshots** (UI changes only)
5. Wait for green CI + a code-owner review before merging.

### Solo-owner merge policy

This repo runs with a single code owner (`* @constk` in `CODEOWNERS`). GitHub forbids a PR author from approving their own PR, so the standard "1 code-owner review" gate cannot be satisfied without an admin override. While in this state, the **intended workflow is**:

```sh
gh pr merge <N> --admin --squash --delete-branch
```

…for `feat:` / `fix:` / `chore:` PRs, and `--admin --merge` (preserves history) for `release:` PRs. The `enforce_admins: false` line in `.github/branch-protection/{develop,main}.json` is the documented escape hatch — admin merge here is the policy, not a deviation from it.

When a second collaborator joins, drop the `--admin` flag and adopt standard PR review. Update this section + `CODEOWNERS` in the same PR.

## Local pre-push gate

```sh
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
name = "harness-python-react"
version = "0.2.8"
version = "0.2.9"
description = "Production-quality LLM-driven coding harness — Python (FastAPI) backend, Vite + React + TypeScript frontend."
readme = "README.md"
requires-python = ">=3.14"
Expand Down
2 changes: 1 addition & 1 deletion uv.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading