Update .mergify.yml

elastic · Oct 10, 2024 · 8bf5205 · 8bf5205
1 parent 0fbd08f
commit 8bf5205
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.mergify.yml b/.mergify.yml
@@ -24,7 +24,7 @@ pull_request_rules:
     actions:
         comment:
           message: |
-            This pull request is now in conflicts. Could you fix it? 🙏
+            This pull request is now in conflict! Could you fix it? 🙏
             To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/
             ```
             git fetch upstream