diff --git a/bert_e/templates/conflict.md b/bert_e/templates/conflict.md index 020ddbbf..4c826915 100644 --- a/bert_e/templates/conflict.md +++ b/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 }} - $ # - $ git commit + git checkout {{ wbranch.name }} + git pull # or "git reset --hard origin/{{ wbranch.name }}" + git merge origin/{{ wbranch.dst_branch.name }} + # + git commit {%- endif %} - $ git merge origin/{{ source.name }} - $ # - $ git commit - $ git push -u origin {{ wbranch.name }} + git merge origin/{{ source.name }} + # + git commit + git push -u origin {{ wbranch.name }} ``` {%endif%} {% endblock %} diff --git a/bert_e/templates/pull_request_description.md b/bert_e/templates/pull_request_description.md index 990b9e02..02103a45 100644 --- a/bert_e/templates/pull_request_description.md +++ b/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 }} - $ # - $ git push origin {{ branch }} + git fetch + git checkout {{ branch }} + # + git push origin {{ branch }} ``` Please always comment pull request #{{ pr.id }} instead of this one.