adds comments to conflicts.yml

cmss13-devs · Jul 24, 2023 · 894e15f · 894e15f
1 parent 047307c
commit 894e15f
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/.github/workflows/conflicts.yml b/.github/workflows/conflicts.yml
@@ -12,4 +12,6 @@ jobs:
       - uses: eps1lon/[email protected]
         with:
           dirtyLabel: 'Merge Conflict'
+          commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."
+          commentOnClean: "Conflicts have been resolved. A maintainer will review the pull request shortly."
           repoToken: ${{ secrets.BOT_TOKEN_CM || secrets.GITHUB_TOKEN }}