Add merge conflict comment

2023-03-22 10:55:37 -04:00
parent 1c9b6005ef
commit b72762bc86
1 changed files with 1 additions and 0 deletions
@@ -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 }}