Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matthiasL-scality merged 1 commit into from
Jul 18, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions bert_e/templates/conflict.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
8 changes: 4 additions & 4 deletions bert_e/templates/pull_request_description.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.