-
Gigg, Martyn Anthony authored
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.