Skip to content

.1915763867792649:1d1c1ff35df8ee6a3692d98ce6f396a6_69def9caf4ff2c686f6068ad.69defaf6f4ff2c686f6068fd.69defaf65d775e0eca8ed934:Trae CN.T(2026/4/15 10:41:58) #1060

.1915763867792649:1d1c1ff35df8ee6a3692d98ce6f396a6_69def9caf4ff2c686f6068ad.69defaf6f4ff2c686f6068fd.69defaf65d775e0eca8ed934:Trae CN.T(2026/4/15 10:41:58)

.1915763867792649:1d1c1ff35df8ee6a3692d98ce6f396a6_69def9caf4ff2c686f6068ad.69defaf6f4ff2c686f6068fd.69defaf65d775e0eca8ed934:Trae CN.T(2026/4/15 10:41:58) #1060

name: "Conflict detector"
on:
push:
pull_request_target:
types: [synchronize]
jobs:
main:
permissions:
contents: read
pull-requests: write
runs-on: ubuntu-latest
steps:
- name: Check if PRs have merge conflicts
uses: eps1lon/actions-label-merge-conflict@v3
with:
dirtyLabel: "conflicts"
repoToken: "${{ secrets.GITHUB_TOKEN }}"
commentOnDirty: "This pull request has a merge conflict that needs to be resolved."