diff --git a/.github/mergify.yml b/.github/mergify.yml index 0b917b2546..fd9d53c5a0 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -12,8 +12,7 @@ pull_request_rules: - milestone~=v[0-9]\.[0-9]{2} actions: comment: - message: This pull request has merge conflicts. Could you please resolve them - @{{author}}? 🙏 + message: This pull request has merge conflicts. Could you please resolve them @{{author}}? 🙏 label: add: - waiting-on-author @@ -105,7 +104,7 @@ queue_rules: {{ body | get_section("## Proposed Changes", "") }} - + {% for commit in commits | unique(attribute='email_author') %} Co-Authored-By: {{ commit.author }} <{{ commit.email_author }}> {% endfor %}