Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Revert "Remove merge conflict comment" (#8820)

Browse Source
This commit is contained in:
ike709
2022-06-13 11:45:23 -05:00
committed by GitHub
parent a39233c6ff
commit 1af683ee90
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/conflict-labeler.yml vendored
View File

@@ -15,3 +15,4 @@ jobs:
with: with:
dirtyLabel: "Merge Conflict" dirtyLabel: "Merge Conflict"
repoToken: "${{ secrets.GITHUB_TOKEN }}" repoToken: "${{ secrets.GITHUB_TOKEN }}"
commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."