aboutsummaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/label-merge-conflict.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.github/workflows/label-merge-conflict.yml b/.github/workflows/label-merge-conflict.yml
index d4e693f7b..6c0268d6c 100644
--- a/.github/workflows/label-merge-conflict.yml
+++ b/.github/workflows/label-merge-conflict.yml
@@ -22,5 +22,5 @@ jobs:
dirtyLabel: "Merge Conflicts"
#removeOnDirtyLabel: "PR: ready to ship"
repoToken: "${{ secrets.GITHUB_TOKEN }}"
- commentOnDirty: "This pull request has conflicts with the base branch. Please resolve those so we can evaluate the pull request."
- commentOnClean: "Conflicts have been resolved! 🎉 A maintainer will review the pull request shortly."
+ commentOnDirty: "This pull request has conflicts with the base branch \"beta\". Please resolve those so we can test out your changes."
+ commentOnClean: "Conflicts have been resolved! 🎉"