| ... | @@ -8,7 +8,7 @@ The OpenAPI Generator project works on multiple versions in parallel: |
... | @@ -8,7 +8,7 @@ The OpenAPI Generator project works on multiple versions in parallel: |
|
|
|
|
|
|
|
To support several versions, several branches are used:
|
|
To support several versions, several branches are used:
|
|
|
|
|
|
|
|
<img width="800" alt="openapi-generator_branches" src="https://user-images.githubusercontent.com/1222165/41271120-03e688c6-6e0f-11e8-80fb-f1616c05aa04.png">
|
|
<img width="800" alt="openapi-generator_branches" src="https://user-images.githubusercontent.com/1222165/41702016-e0412c92-752e-11e8-8382-2dd935390c90.png">
|
|
|
|
|
|
|
|
|
|
|
|
|
Status in June 2018:
|
|
Status in June 2018:
|
| ... | @@ -37,9 +37,10 @@ Merge commit is kept in the history in order to facilitate merge conflict resolu |
... | @@ -37,9 +37,10 @@ Merge commit is kept in the history in order to facilitate merge conflict resolu |
|
|
When we drop the support for `3.0.x`, we'll merge `3.1.0` back into `master`.
|
|
When we drop the support for `3.0.x`, we'll merge `3.1.0` back into `master`.
|
|
|
|
|
|
|
|
|
|
|
|
|
## How-to: create merge commit.
|
|
## How-to: create merge commits
|
|
|
|
|
|
|
|
Be careful of the merge direction.
|
|
Be careful of the merge direction.
|
|
|
|
Keep merge commits as part of the history (no squash, ...).
|
|
|
|
|
|
|
|
Example for `master` -> `3.1.x` branch:
|
|
Example for `master` -> `3.1.x` branch:
|
|
|
|
|
|
| ... | | ... | |
