Git-Branches.md

@@ -69,8 +69,42 @@ git push
 
 ### Solving conflicts during merge
 
-> TODO, add useful git command, inspired by the discussion in https://github.com/OpenAPITools/openapi-generator/issues/245
+In the `samples/` folder a lot of files contains the version of the generator `.openapi-generator/VERSION`, or comments in code:
+
+Examples:
+
+```diff
+--- a/samples/____/.openapi-generator/VERSION
++++ b/samples/____/.openapi-generator/VERSION
+@@ -1 +1 @@
+-3.0.1-SNAPSHOT
+\ No newline at end of file
++3.1.0-SNAPSHOT
+\ No newline at end of file
+```
+
+or:
+
+```diff
+--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php
++++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php
+@@ -17,7 +17,7 @@
+  * OpenAPI spec version: 1.0.0
+  * 
+  * Generated by: https://openapi-generator.tech
+- * OpenAPI Generator version: 3.1.0-SNAPSHOT
++ * OpenAPI Generator version: 3.0.3-SNAPSHOT
+  */
+```
+
+Those conflicts can be ignored during merge (keep the "ours" version):
+
+```
+git checkout --ours samples/*
+git add samples/*
+```
 
+Run `mvn clean verify` and `bin/utils/ensure-up-to-date` to be sure that you have updated the `samples/` during the merge commit.
 
 ## Necessary steps when a new working branch is created