diff --git a/.github/workflows/automation.yml b/.github/workflows/automation.yml index e69d125c56..5bf60036f6 100644 --- a/.github/workflows/automation.yml +++ b/.github/workflows/automation.yml @@ -17,4 +17,5 @@ jobs: - uses: eps1lon/actions-label-merge-conflict@fd1f295ee7443d13745804bc49fe158e240f6c6e # tag=v2.1.0 with: dirtyLabel: 'merge conflict' + commentOnDirty: 'This pull request has merge conflicts. Please resolve the conflicts so the PR can be successfully reviewed and merged.' repoToken: ${{ secrets.JF_BOT_TOKEN }}