Commit be0a43b0 authored by Gigg, Martyn Anthony's avatar Gigg, Martyn Anthony Committed by Martyn Gigg
Browse files

Create action to label pull requests in a conflicted state

parent 47af5006
name: 'Check for merge conflicts'
on:
push:
branches:
- master
- release-next
jobs:
label-conflicts:
runs-on: ubuntu-latest
steps:
- uses: prince-chrismc/label-merge-conflicts-action@v1
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."
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment