Skip to content

Commit

Permalink
Update conflicts.yml
Browse files Browse the repository at this point in the history
why broken
  • Loading branch information
Xlinka committed Apr 17, 2024
1 parent a7598bc commit 86a4e4e
Showing 1 changed file with 7 additions and 14 deletions.
21 changes: 7 additions & 14 deletions .github/workflows/conflicts.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,16 @@
name: Check for merge conflicts
name: 'Check for merge conflicts'
on:
push:
branches:
- main
pull_request:
branches:
- main

jobs:
add_labels:
triage:
runs-on: ubuntu-latest
permissions:
contents: write
pull-requests: write
repository-projects: write
steps:
- name: Checkout code
uses: actions/checkout@v2


- name: Check for merge conflicts
uses: mschilde/[email protected]
- uses: mschilde/[email protected]
with:
CONFLICT_LABEL_NAME: "Has Conflicts"
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 comments on commit 86a4e4e

Please sign in to comment.