fix: copy changes from `dev/0.15.0` branch

pull/240/head
Josh Moore 1 year ago committed by GitHub
parent 72f0087fb0
commit 6acf0807b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -1,7 +1,6 @@
name: Merge Conflict Labeler
on:
push:
pull_request_target:
types: [ synchronize ]
@ -15,6 +14,6 @@ jobs:
if: ${{ github.event_name == 'push' || github.event_name == 'pull_request_target'}}
with:
dirtyLabel: 'merge conflict'
commentOnDirty: 'This pull request has merge conflicts. Please resolve the conflicts so the PR can be successfully reviewed and merged.'
commentOnClean: "Conflicts have been resolved. A maintainer will review the pull request shortly."
commentOnDirty: '**[AUTOMATED MESSAGE]** 🔴 This Pull Request has merge conflicts. Please resolve the conflicts so the PR can be successfully reviewed and merged.'
commentOnClean: '**[AUTOMATED MESSAGE]** 🟢 Conflicts have been resolved.'
repoToken: "${{ secrets.GH_TOKEN }}"
Loading…
Cancel
Save