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 511e03a commit 5c8adee
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions .github/workflows/conflicts.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
name: 'Check for merge conflicts'
name: Check for merge conflicts
on:
push:
branches:
- main
pull_request:
branches:
- main

jobs:
triage:
runs-on: ubuntu-latest

steps:
- uses: mschilde/[email protected]
- name: Checkout code
uses: actions/checkout@v2

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

0 comments on commit 5c8adee

Please sign in to comment.