Revert "Remove merge conflict comment" (#8820)
This commit is contained in:
1
.github/workflows/conflict-labeler.yml
vendored
1
.github/workflows/conflict-labeler.yml
vendored
@@ -15,3 +15,4 @@ jobs:
|
||||
with:
|
||||
dirtyLabel: "Merge Conflict"
|
||||
repoToken: "${{ secrets.GITHUB_TOKEN }}"
|
||||
commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."
|
||||
|
||||
Reference in New Issue
Block a user