From 48f0badde3975886e9753d3ec6bce4e50173a697 Mon Sep 17 00:00:00 2001 From: Charles Sibbald Date: Tue, 27 Oct 2026 21:21:25 +0200 Subject: [PATCH] docs: CONTRIBUTING: integration branch first, upstream PRs cut separately Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Y3TSRmEZAYU6RBUXhkn7WF --- CONTRIBUTING.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..448e728 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,17 @@ +# Contributing to this fork + +This repository is a fork. Its integration branch is `master`: it carries every +change made in this fork, and it is the only branch that projects depending on +the fork should consume (a dependent can follow just one branch). + +- **Changes land here first.** Every fix or feature goes to `master` through a pull + request merged with a merge commit. Branches that dependents pin are never + rebased or force-pushed. +- **Upstream proposals are cut separately.** Once a change is on `master`, the + pull request for the upstream project is cut fresh from upstream's default + branch as a single-purpose change (one concern, one commit, following + upstream's conventions). It is not merged from `master`. +- **Upstream is merged in regularly.** Upstream's default branch is merged into + `master` so the fork stays a superset of upstream. +- **Before an upstream pull request merges or closes,** check that its content is + on `master` (by content, not commit hashes: upstream branches are re-cut).