Unverified Commit 3ee31c71 authored by Gigg, Martyn Anthony's avatar Gigg, Martyn Anthony Committed by GitHub
Browse files

Run conflict labelling action on all pushes

If a conflict is resolved but the action only runs on merge to the select branches then the 'Has Conflicts' label is not removed until a push to this limited set of branches occurs.
Run on all push events to give the most up to date information.
parent 09994cb7
name: 'Check for merge conflicts'
- master
- release-next
runs-on: ubuntu-latest
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