Skip to content

New "Bulky" computers, small bug fixes also related to computers, addition of altitude controller to the CIC #25115

New "Bulky" computers, small bug fixes also related to computers, addition of altitude controller to the CIC

New "Bulky" computers, small bug fixes also related to computers, addition of altitude controller to the CIC #25115

Workflow file for this run

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 }}