... | @@ -39,4 +39,10 @@ When we drop the support for `3.0.x`, we'll merge `3.1.0` back into `master`. |
... | @@ -39,4 +39,10 @@ When we drop the support for `3.0.x`, we'll merge `3.1.0` back into `master`. |
|
|
|
|
|
## Solving conflicts during merge
|
|
## Solving conflicts during merge
|
|
|
|
|
|
> TODO, add useful git command, inspired by the discussion in https://github.com/OpenAPITools/openapi-generator/issues/245 |
|
> TODO, add useful git command, inspired by the discussion in https://github.com/OpenAPITools/openapi-generator/issues/245
|
|
\ No newline at end of file |
|
|
|
|
|
|
|
|
|
## Necessary steps when a new working branch is created
|
|
|
|
|
|
|
|
* Set it as protected branch in the GitHub configs
|
|
|
|
* Update readme (branch list, badges…) |