Skip to content

Commit

Permalink
Further clarify branching/merging
Browse files Browse the repository at this point in the history
  • Loading branch information
handrews committed Oct 23, 2024
1 parent 0d061e9 commit b25809b
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,15 @@ For information on the branch and release strategy for OAS 3.0.4 and 3.1.1 and e

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

* `dev` branches from `main` at the 3.1.1 release commit
* Each `X.Y-dev` branches from main
* Each `X.Y.Z-rel` branches from the corresponding `X.Y-dev`
* 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
* This `X.Y.0` release commit on `dev` is the base of `X.Y+1-dev`
* Patch releases are _not_ merged to `dev`
* Only `X.Y.Z-rel` (post-rename of `src/oad.md`) are merged to `main`
* Publishing to the [spec site](https://spec.openapis.org) is triggered by the merge to `main`

```mermaid
gitGraph TB:
commit id:"merge 3.1.1.md to main" tag:"3.1.1"
Expand Down

0 comments on commit b25809b

Please sign in to comment.