44ad721a3a
This reverts commit 047171a475a56d94dacc10ba4c96222a543a2e15. Co-authored-by: Mona Hmiza <>
20 lines
535 B
YAML
20 lines
535 B
YAML
name: Check Merge Conflicts
|
|
|
|
on:
|
|
push:
|
|
branches:
|
|
- master
|
|
pull_request_target:
|
|
|
|
jobs:
|
|
Label:
|
|
if: github.actor != 'PJBot'
|
|
runs-on: self-hosted
|
|
steps:
|
|
- name: Check for Merge Conflicts
|
|
uses: ike709/actions-label-merge-conflict@9eefdd17e10566023c46d2dc6dc04fcb8ec76142
|
|
with:
|
|
dirtyLabel: "Merge Conflict"
|
|
repoToken: "${{ secrets.GITHUB_TOKEN }}"
|
|
commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."
|