Skip to content

Merge remote-tracking branch 'origin/master' into PB-117 #80

Merge remote-tracking branch 'origin/master' into PB-117

Merge remote-tracking branch 'origin/master' into PB-117 #80

name: 'Check for merge conflicts'
on: [push]
jobs:
find_conflicts:
runs-on: ubuntu-20.04
steps:
- uses: mschilde/auto-label-merge-conflicts@master
with:
CONFLICT_LABEL_NAME: "has conflicts"
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
MAX_RETRIES: 5
WAIT_MS: 5000