Skip to content

Commit

Permalink
[CI/Build] change conflict PR comment from mergify (vllm-project#10080)
Browse files Browse the repository at this point in the history
Signed-off-by: Russell Bryant <[email protected]>
Signed-off-by: Loc Huynh <[email protected]>
  • Loading branch information
russellb authored and JC1DA committed Nov 11, 2024
1 parent d691653 commit 08d1364
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion .github/mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ pull_request_rules:
comment:
message: |
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
conditions:
Expand Down

0 comments on commit 08d1364

Please sign in to comment.