[CI/Build] change conflict PR comment from mergify

On PRs opened by dependabot, this comment is interpreted by dependabot as a command to rebase the PR. We don't need the bots telling each other what to do. An example is vllm-project#9746. The simplest change is to update the text so it will no longer be interpreted as a command by dependabot. We do that by putting the "rebase" word prior to the username mention. Signed-off-by: Russell Bryant <[email protected]>
russellb · Nov 6, 2024 · f997b8f · f997b8f
1 parent 731aec5
commit f997b8f
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/.github/mergify.yml b/.github/mergify.yml
@@ -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: