mirror of
https://github.com/yairm210/Unciv.git
synced 2024-12-22 22:34:32 +07:00
22 lines
795 B
YAML
22 lines
795 B
YAML
name: "Conflict marking"
|
|
on:
|
|
# So that PRs touching the same files as the push are updated
|
|
push:
|
|
# So that the `dirtyLabel` is removed if conflicts are resolve
|
|
# We recommend `pull_request_target` so that github secrets are available.
|
|
# In `pull_request` we wouldn't be able to change labels of fork PRs
|
|
pull_request_target:
|
|
types: [synchronize]
|
|
|
|
jobs:
|
|
main:
|
|
runs-on: ubuntu-latest
|
|
steps:
|
|
- name: check conflicting PRs
|
|
uses: eps1lon/actions-label-merge-conflict@releases/2.x
|
|
with:
|
|
dirtyLabel: "Conflicts"
|
|
repoToken: "${{ secrets.GITHUB_TOKEN }}"
|
|
commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."
|
|
commentOnClean: "Conflicts have been resolved."
|