Skip to content

Convert Quasi tab to MVP #16194

Convert Quasi tab to MVP

Convert Quasi tab to MVP #16194

name: 'Check for merge conflicts'
on:
push:
branches:
- 'main'
- 'release-next'
- 'ornl-next'
pull_request:
types: [opened, synchronize, reopened]
permissions:
issues: write
pull-requests: write
jobs:
label-conflicts:
runs-on: ubuntu-latest
steps:
- uses: prince-chrismc/label-merge-conflicts-action@v3
with:
conflict_label_name: "Has Conflicts"
github_token: ${{ secrets.GITHUB_TOKEN }}
# These are optional incase you need to adjust for the limitations described below
max_retries: 5
wait_ms: 15000
detect_merge_changes: false
conflict_comment: ":wave: Hi, @${author},\n\nConflicts have been detected against the base branch. Please rebase your branch against the base branch."