| ... | ... | @@ -8,7 +8,7 @@ The OpenAPI Generator project works on multiple versions in parallel: |
|
|
|
|
|
|
|
To support several versions, several branches are used:
|
|
|
|
|
|
|
|
<img width="800" alt="openapi-generator_branches" src="https://user-images.githubusercontent.com/1222165/41702016-e0412c92-752e-11e8-8382-2dd935390c90.png">
|
|
|
|
<img width="800" alt="openapi-generator_branches" src="https://user-images.githubusercontent.com/1222165/41759356-5a886c12-75ee-11e8-8314-2ede8aa096ec.png">
|
|
|
|
|
|
|
|
|
|
|
|
Status in June 2018:
|
| ... | ... | @@ -34,7 +34,17 @@ Merge commit is kept in the history in order to facilitate merge conflict resolu |
|
|
|
|
|
|
|
### Merging back on master
|
|
|
|
|
|
|
|
When we drop the support for `3.0.x`, we'll merge `3.1.0` back into `master`.
|
|
|
|
When we want to jump on the next version, the working branch is merged back:
|
|
|
|
|
|
|
|
<img width="800" alt="Merge back" src="https://user-images.githubusercontent.com/1222165/41759450-ebadb738-75ee-11e8-86e1-9bd45423571f.png">
|
|
|
|
|
|
|
|
Example (end of June 2018):
|
|
|
|
|
|
|
|
* When we drop the support for `3.0.x`, we'll merge `3.1.x` back into `master`:
|
|
|
|
- There will be one last `3.0.x` release : `3.0.3` (orange commit)
|
|
|
|
- Then we merge `3.1.x` into `master`, on the master branch the version is updated to `3.1.0-SNAPSHOT`
|
|
|
|
- The `master` branch is now use to do the next `3.1.0` release and then weekly bugfix releases: `3.1.1`, `3.1.2` ...
|
|
|
|
- We can create the `3.2.x` branch to work on the next minor release `3.2.0-SNAPSHOT`
|
|
|
|
|
|
|
|
|
|
|
|
## How-to: create merge commits
|
| ... | ... | |
