From cade7396b307628dd730295fda7c460872859307 Mon Sep 17 00:00:00 2001 From: Randell Dawson <5313213+RandellDawson@users.noreply.github.com> Date: Mon, 27 Jul 2020 02:16:53 -0700 Subject: [PATCH] chore(tools): Add GitHub Action to label merge conflicts (#39317) Co-authored-by: Oliver Eyton-Williams --- .github/workflows/label_merge_conflicts.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .github/workflows/label_merge_conflicts.yml diff --git a/.github/workflows/label_merge_conflicts.yml b/.github/workflows/label_merge_conflicts.yml new file mode 100644 index 0000000000..7163181876 --- /dev/null +++ b/.github/workflows/label_merge_conflicts.yml @@ -0,0 +1,11 @@ +name: 'Check for merge conflicts' +on: + push +jobs: + triage: + runs-on: ubuntu-18.04 + steps: + - uses: mschilde/auto-label-merge-conflicts@master + with: + CONFLICT_LABEL_NAME: 'status: merge conflict' + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}