Skip to content
Check for merge conflicts

Makes rear dropship doors solid again and refactors multi door filler turf logic #16198

Sign in to view logs

Makes rear dropship doors solid again and refactors multi door filler turf logic

Makes rear dropship doors solid again and refactors multi door filler turf logic #16198

Workflow file for this run

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