diff --git a/.mergify.yml b/.mergify.yml index f89ec57..85f89cd 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -31,7 +31,7 @@ pull_request_rules: - name: ask to resolve conflict conditions: - - conflicts + - conflict actions: comment: message: This pull request has now conflicts with the base branch. Could you please try to fix them? 🙏