Skip to content
Check for merge conflicts

Whiskey Outpost for burrower add the ability to make tunnel but remove the ability to burrow. #22941

Sign in to view logs

Whiskey Outpost for burrower add the ability to make tunnel but remove the ability to burrow.

Whiskey Outpost for burrower add the ability to make tunnel but remove the ability to burrow. #22941

Workflow file for this run

.github/workflows/conflicts.yml at 9134d58
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 }}