diff options
| -rw-r--r-- | .github/workflows/automation.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.github/workflows/automation.yml b/.github/workflows/automation.yml index 4b5571c77..47abce02a 100644 --- a/.github/workflows/automation.yml +++ b/.github/workflows/automation.yml @@ -19,6 +19,7 @@ jobs: if: ${{ github.event_name == 'push' || github.event_name == 'pull_request_target'}} 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 }} project: |