Workflows: Automate applying merge-conflict label

Adam Snyderrequested to merge
github/fork/armsnyder/workflow-pr-check-conflicts into master

Description

Automatically adds and removes the merge-conflict label based on whether the PR has merge conflicts.

Action docs: https://github.com/marketplace/actions/label-conflicting-pull-requests

I configured it to comment on the PRs, but we can turn that off if it's too noisy.

Tested in my fork.

PR Checklist

  • Resource attributes match 1:1 the names and structure of the API resource in the GitLab API documentation.
  • Examples are updated with:
    • A *.tf file for the resource/s with at least one usage example
    • A *.sh file for the resource/s with an import example (if applicable)
  • New resources have at minimum a basic test with three steps:
    • Create the resource
    • Update the attributes
    • Import the resource
  • No new //lintignore comments that came from copied code. Linter rules are meant to be enforced on new code.

Merge request reports