(PTFE-2503) Add better copy past template (#254)

Author: matthiasL-scality

bert_e/templates/conflict.md

@@ -47,20 +47,20 @@ Please resolve the conflict on **the integration branch** (`{{ wbranch.name }}`)
 Here are the steps to resolve this conflict:
 
 ```bash
- $ git fetch
+ git fetch
  {% if empty -%}
- $ git checkout -B {{ wbranch.name }} origin/{{ wbranch.dst_branch.name }}
+ git checkout -B {{ wbranch.name }} origin/{{ wbranch.dst_branch.name }}
 {%- else -%}
- $ git checkout {{ wbranch.name }}
- $ git pull  # or "git reset --hard origin/{{ wbranch.name }}"
- $ git merge origin/{{ wbranch.dst_branch.name }}
- $ # <intense conflict resolution>
- $ git commit
+ git checkout {{ wbranch.name }}
+ git pull  # or "git reset --hard origin/{{ wbranch.name }}"
+ git merge origin/{{ wbranch.dst_branch.name }}
+ # <intense conflict resolution>
+ git commit
 {%- endif %}
- $ git merge origin/{{ source.name }}
- $ # <intense conflict resolution>
- $ git commit
- $ git push -u origin {{ wbranch.name }}
+ git merge origin/{{ source.name }}
+ # <intense conflict resolution>
+ git commit
+ git push -u origin {{ wbranch.name }}
 ```
 {%endif%}
 {% endblock %}

bert_e/templates/pull_request_description.md

@@ -7,10 +7,10 @@ If you need to amend/cancel the changeset on branch
 procedure:
 
 ```bash
- $ git fetch
- $ git checkout {{ branch }}
- $ # <amend or cancel the changeset by _adding_ new commits>
- $ git push origin {{ branch }}
+ git fetch
+ git checkout {{ branch }}
+ # <amend or cancel the changeset by _adding_ new commits>
+ git push origin {{ branch }}
 ```
 
 Please always comment pull request #{{ pr.id }} instead of this one.