Skip to content
This repository has been archived by the owner on Apr 27, 2024. It is now read-only.

Merge pull request #12 from SS14-Classic/pillar #10

Merge pull request #12 from SS14-Classic/pillar

Merge pull request #12 from SS14-Classic/pillar #10

name: Check Merge Conflicts
on:
push:
branches:
- master
pull_request_target:
jobs:
Label:
if: github.actor != 'PJBot'
runs-on: ubuntu-latest
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."