From 09147a47cb1821bd8615764fda67ce710e69d311 Mon Sep 17 00:00:00 2001
From: Bill Thornton <billt2006@gmail.com>
Date: Wed, 22 Mar 2023 11:09:06 -0400
Subject: [PATCH] Add merge conflict comment

---
 .github/workflows/automation.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/automation.yml b/.github/workflows/automation.yml
index 4b5571c774..47abce02a3 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: