Merge pull request #141 from PHPCSStandards/feature/ghactions-more-label-mngmnt

GH Actions/label mngmnt: various tweaks

Author: jrfnl

.github/workflows/label-merge-conflicts.yml

@@ -1,9 +1,17 @@
 name: Check PRs for merge conflicts
 
 on:
+  # Check for new conflicts due to merges.
   push:
     branches:
       - master
+  # Check conflicts in new PRs and for resolved conflicts due to an open PR being updated.
+  pull_request_target:
+    types:
+      - opened
+      - edited
+      - synchronize
+      - reopened
 
 # Cancels all previous workflow runs for the same branch that have not yet completed.
 concurrency:

.github/workflows/label-remove-outdated.yml

@@ -39,6 +39,7 @@ jobs:
           labels: |
             Status: awaiting feedback
             Status: close candidate
+            Status: has merge conflict
             Status: needs investigation
             Status: triage