2024-04-15 16:41:43 +02:00
|
|
|
# Detect and label pull requests that have merge conflicts
|
|
|
|
|
name: 🏗️ Check Merge Conflicts
|
|
|
|
|
on:
|
|
|
|
|
push:
|
|
|
|
|
branches:
|
|
|
|
|
- staging
|
|
|
|
|
jobs:
|
|
|
|
|
check-conflicts:
|
2024-04-28 04:41:50 +02:00
|
|
|
if: github.repository == 'SillyTavern/SillyTavern'
|
2024-04-15 16:41:43 +02:00
|
|
|
runs-on: ubuntu-latest
|
|
|
|
|
steps:
|
|
|
|
|
- uses: mschilde/auto-label-merge-conflicts@master
|
|
|
|
|
with:
|
|
|
|
|
CONFLICT_LABEL_NAME: "🚫 Merge Conflicts"
|
|
|
|
|
GITHUB_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
|
|
|
|
|
MAX_RETRIES: 5
|
|
|
|
|
WAIT_MS: 5000
|
