@tduncan / Nvidia-Optimization-Stack-VLLM Mirror · read-only / commits / 87bd7e0515
Fork 0

A high-throughput and memory-efficient inference and serving engine for LLMs

Mirrored from https://github.com/tduncan-lum/Nvidia-Optimization-Stack---VLLM.git

Synced Nov 16, 08:15 UTC

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

Signed-off-by: Russell Bryant <rbryant@redhat.com>

Russell Bryant committed Nov 6, 2024 at 13:15 UTC 87bd7e0515eebd9344272a3136d7bd662c607438
1 file changed +3 -1
.github/mergify.yml
+3 -1
@@ -46,7 +46,9 @@ pull_request_rules:
46 comment:
47 message: |
48 This pull request has merge conflicts that must be resolved before it can be
49 - merged. @{{author}} please rebase it. https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork
49 + merged. Please rebase the PR, @{{author}}.
50 +
51 + https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork
52
53 - name: remove 'needs-rebase' label when conflict is resolved
54 conditions: