Skip to content

Commit

Permalink
Add Action to add label to PR on merge conflict (#239)
Browse files Browse the repository at this point in the history
Adds a GitHub Action that auto-adds a label to a PR in case there are merge conflicts.
  • Loading branch information
GeckoEidechse committed Dec 20, 2023
1 parent bc6fd87 commit 702a4bb
Showing 1 changed file with 16 additions and 0 deletions.
16 changes: 16 additions & 0 deletions .github/workflows/merge-conflict-auto-label.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Merge Conflict Auto Label
on:
push:
branches:
- main

jobs:
triage:
runs-on: ubuntu-latest
steps:
- uses: mschilde/auto-label-merge-conflicts@master
with:
CONFLICT_LABEL_NAME: "merge conflicts"
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
MAX_RETRIES: 5
WAIT_MS: 5000

0 comments on commit 702a4bb

Please sign in to comment.