From b72762bc86da3cb2f987d4cf119f6e5746888699 Mon Sep 17 00:00:00 2001
From: Bill Thornton <thornbill@users.noreply.github.com>
Date: Wed, 22 Mar 2023 10:55:37 -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 e69d125c56..97cc382b47 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 }}