Skip to content

Commit

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

jobs:
triage:
add_labels:
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]
with:
Expand Down

0 comments on commit a7598bc

Please sign in to comment.