File tree 1 file changed +9
-0
lines changed
1 file changed +9
-0
lines changed Original file line number Diff line number Diff 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
39
39
40
40
### Branch diagram (3.1.2, 3.2.0, and later)
41
41
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
+
42
51
``` mermaid
43
52
gitGraph TB:
44
53
commit id:"merge 3.1.1.md to main" tag:"3.1.1"
You can’t perform that action at this time.
0 commit comments