Skip to content

GitLab

Unverified Commit 87bd7e05 authored by Russell Bryant's avatar Russell Bryant Committed by GitHub
Browse files

[CI/Build] change conflict PR comment from mergify (#10080) 


Signed-off-by: default avatarRussell Bryant <rbryant@redhat.com>
parent 098f94de
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
.github/mergify.yml
View file @ 87bd7e05
...@@ -46,7 +46,9 @@ pull_request_rules: ...@@ -46,7 +46,9 @@ pull_request_rules:
comment: comment:
message: | message: |
This pull request has merge conflicts that must be resolved before it can be This pull request has merge conflicts that must be resolved before it can be
merged. @{{author}} please rebase it. https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork merged. Please rebase the PR, @{{author}}.
https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork
- name: remove 'needs-rebase' label when conflict is resolved - name: remove 'needs-rebase' label when conflict is resolved
conditions: conditions:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment