Add merge conflict comment

2 years ago · 09147a47cb
parent 9f7418cf42
commit 09147a47cb
1 changed files with 1 additions and 0 deletions
--- 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: