Skip to content

Commit b25809b

Browse files
committed
Further clarify branching/merging
1 parent 0d061e9 commit b25809b

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

CONTRIBUTING.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,15 @@ For information on the branch and release strategy for OAS 3.0.4 and 3.1.1 and e
3939

4040
### Branch diagram (3.1.2, 3.2.0, and later)
4141

42+
* `dev` branches from `main` at the 3.1.1 release commit
43+
* Each `X.Y-dev` branches from main
44+
* Each `X.Y.Z-rel` branches from the corresponding `X.Y-dev`
45+
* The same `X.Y-dev` commit that is the base of `X.Y.0-rel` is merged back to `dev` to keep `src/oas.md` on `dev` in sync with the last minor release
46+
* This `X.Y.0` release commit on `dev` is the base of `X.Y+1-dev`
47+
* Patch releases are _not_ merged to `dev`
48+
* Only `X.Y.Z-rel` (post-rename of `src/oad.md`) are merged to `main`
49+
* Publishing to the [spec site](https://spec.openapis.org) is triggered by the merge to `main`
50+
4251
```mermaid
4352
gitGraph TB:
4453
commit id:"merge 3.1.1.md to main" tag:"3.1.1"

0 commit comments

Comments
 (0)