Skip to content
Check for merge conflicts

Adds the ability to pick up paper bins and stops fires consuming more wood when they're full #15214

Sign in to view logs

Adds the ability to pick up paper bins and stops fires consuming more wood when they're full

Adds the ability to pick up paper bins and stops fires consuming more wood when they're full #15214

Workflow file for this run

.github/workflows/conflicts.yml at a70499f
name: 'Check for merge conflicts'
on:
push:
branches:
- master
pull_request_target:
types: [ready_for_review, opened, synchronize, reopened]
jobs:
triage:
runs-on: ubuntu-latest
steps:
- uses: eps1lon/[email protected]
with:
dirtyLabel: 'Merge Conflict'
commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."
commentOnClean: "Conflicts have been resolved. A maintainer will review the pull request shortly."
repoToken: ${{ secrets.BOT_TOKEN_CM || secrets.GITHUB_TOKEN }}