diff options
| author | Bill Thornton <thornbill@users.noreply.github.com> | 2023-03-22 11:26:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-22 11:26:41 -0400 |
| commit | 058bd40ff440f5a1e143dcc54193bb9022ad2a7c (patch) | |
| tree | 4bc8bf2fd493dd18a9e89c56eab1a767430aac15 | |
| parent | 9f7418cf425ac295967ec5b826d992f69fa2fa10 (diff) | |
| parent | 09147a47cb1821bd8615764fda67ce710e69d311 (diff) | |
Merge pull request #9529 from thornbill/add-merge-conflict-comment
Add merge conflict comment
| -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: |