From 5c8adee060051bd80369607575a31d3539c6e5dc Mon Sep 17 00:00:00 2001 From: xLinka Date: Wed, 17 Apr 2024 11:44:57 +0100 Subject: [PATCH] Update conflicts.yml --- .github/workflows/conflicts.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/conflicts.yml b/.github/workflows/conflicts.yml index 63e08c4..4284d48 100644 --- a/.github/workflows/conflicts.yml +++ b/.github/workflows/conflicts.yml @@ -1,4 +1,4 @@ -name: 'Check for merge conflicts' +name: Check for merge conflicts on: push: branches: @@ -6,11 +6,17 @@ on: pull_request: branches: - main + jobs: triage: runs-on: ubuntu-latest + steps: - - uses: mschilde/auto-label-merge-conflicts@v2.0 + - name: Checkout code + uses: actions/checkout@v2 + + - name: Check for merge conflicts + uses: mschilde/auto-label-merge-conflicts@v2.0 with: CONFLICT_LABEL_NAME: "Has Conflicts" - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}