Git-Branches.md

@@ -37,12 +37,32 @@ 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`.
 
 
-## Solving conflicts during merge
+## How-to: create merge commit.
+
+Be careful of the merge direction.
+
+Example for `master` -> `3.1.x` branch:
+
+```
+git fetch
+git checkout origin/3.1.x -B 3.1.x
+git merge origin/master
+```
+
+Review the merge commit.
+You can run some checks locally `mvn clean verify`, `bin/utils/ensure-up-to-date`...
+
+```
+git push
+```
+
+### Solving conflicts during merge
 
 > TODO, add useful git command, inspired by the discussion in https://github.com/OpenAPITools/openapi-generator/issues/245
 
 
 ## Necessary steps when a new working branch is created
 
+* Edit the [`if` condition in the `.travis.yml` file](https://github.com/OpenAPITools/openapi-generator/blob/4664c07034fac99cfb6354fae6301d85f4f96810/.travis.yml#L115) to allow the working branches to do a `mvn deploy` of the artifacts
 * Set it as protected branch in the GitHub configs
 * Update readme (branch list, badges…)