feature: BERTE-548 Split conflict resolution steps

Author: miniscruff

CHANGELOG

@@ -1,6 +1,10 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [3.6.2] - 2021-06-24
+# Changed
+- Conflict resolution steps split to allow direct copy and paste
+
 ## [3.6.1] - 2021-05-26
 # Fixed
 - API call error was returning to much information, now it return only action results.

bert_e/templates/conflict.md

@@ -11,13 +11,16 @@ destination branch `{{ wbranch.dst_branch.name }}`.
 
 Please resolve the conflict on **the feature branch** (`{{ feature_branch.name }}`).
 
-```bash
- $ git fetch
- $ git checkout origin/{{ feature_branch.name }}
- $ git merge origin/{{ dev_branch.name }}
- $ # <intense conflict resolution>
- $ git commit
- $ git push origin HEAD:{{ feature_branch.name }}
+```sh
+git fetch && \
+git checkout origin/{{ feature_branch.name }} && \
+git merge origin/{{ dev_branch.name }}
+```
+
+Resolve merge conflicts and commit
+
+```sh
+git push origin HEAD:{{ feature_branch.name }}
 ```
 
 {% if source.name == dev_branch.name -%}