From 16742f0925664fecbb0224888b556b292da32f57 Mon Sep 17 00:00:00 2001 From: Charles Ewert Date: Wed, 22 Mar 2023 22:06:18 -0400 Subject: [PATCH] leave a comment on PR for merge conflicts --- .github/workflows/automations.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/automations.yml b/.github/workflows/automations.yml index d7a2f3df..161c1ec5 100644 --- a/.github/workflows/automations.yml +++ b/.github/workflows/automations.yml @@ -30,4 +30,5 @@ jobs: uses: eps1lon/actions-label-merge-conflict@releases/2.x with: dirtyLabel: "merge conflict" + commentOnDirty: "This pull request has merge conflicts. Please resolve the conflicts so the PR can be reviewed. Thanks!" repoToken: ${{ secrets.GITHUB_TOKEN }}