From 0da098afb61f9d9ce9f0c457bc803061e89f11bd Mon Sep 17 00:00:00 2001 From: aclist <92275929+aclist@users.noreply.github.com> Date: Thu, 30 Oct 2025 11:36:10 +0900 Subject: [PATCH] chore: mention branch basing conventions --- CONTRIBUTING.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 791f660..4e302b8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -50,8 +50,10 @@ If you would like to take ownership or assist with an issue on the issue tracker contribute a new change, please follow the guidelines below. Fork this repository and check out the code up to `prerelease/`. -All new features and fixes will be merged to this branch, so open your branch -from here. +If there is no pending prerelease PR, you can base your changes off of +the `testing` branch. You may later be asked to retarget your PR to the prerelease +branch once a new one is made. This is because out-of-band PRs are consolidated into +the next release before merging. The following naming conventions apply for PRs: - fix/ - patch/hotfix branches @@ -61,7 +63,7 @@ The following naming conventions apply for PRs: Implement your changes and test them locally. If they work you may open a merge request, and then we review your changes. If everything is OK, it -will be merged to `prerelease/`, then `testing` and after a live +will be merged to `prerelease/`, then `testing`, and after a live testing phase, to `stable` as well. It is recommended to follow