Skip to content

Commit e0df121

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

File tree

1 file changed

+20
-0
lines changed

1 file changed

+20
-0
lines changed

Diff for: CONTRIBUTING.md

+20
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,26 @@ 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+
Initial steps:
43+
44+
* `dev` branches from `main` at the 3.1.1 release commit
45+
* Each `X.Y-dev` branches from `dev`
46+
47+
Upon release:
48+
49+
* Each `X.Y.Z-rel` branches from the corresponding `X.Y-dev`
50+
* After renaming `src/oad.md`, `X.Y.Z-rel` merges to `main`
51+
* Publishing to the [spec site](https://spec.openapis.org) is triggered by the merge to `main`
52+
53+
Initiating the next minor release after releasing `X.Y.0`:
54+
55+
* 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
56+
* This `X.Y.0` commit on `dev` is the base of `X.Y+1-dev`
57+
58+
Other notes:
59+
60+
* Patch releases are _not_ merged to `dev`
61+
4262
```mermaid
4363
gitGraph TB:
4464
commit id:"merge 3.1.1.md to main" tag:"3.1.1"

0 commit comments

Comments
 (0)