Skip to content
Check for merge conflicts

Add flanking possiblities to the lifeboat by adding two clamp with doors on each exterior side. #13952

Sign in to view logs

Add flanking possiblities to the lifeboat by adding two clamp with doors on each exterior side.

Add flanking possiblities to the lifeboat by adding two clamp with doors on each exterior side. #13952

Workflow file for this run

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