Skip to content

Merge pull request #1143 from kittysmooch/yeah-thats-going-in-my-crin… #998

Merge pull request #1143 from kittysmooch/yeah-thats-going-in-my-crin…

Merge pull request #1143 from kittysmooch/yeah-thats-going-in-my-crin… #998

name: 'Merge Conflict Detection'
on:
push:
branches:
- main
jobs:
triage:
runs-on: ubuntu-latest
steps:
- uses: mschilde/auto-label-merge-conflicts@master
with:
CONFLICT_LABEL_NAME: "has conflicts"
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
MAX_RETRIES: 5
WAIT_MS: 5000