Skip to content

Feature: New Year Cake Tracker #14319

Feature: New Year Cake Tracker

Feature: New Year Cake Tracker #14319

name: "Merge Conflict Label"
on:
# So that PRs touching the same files as the push are updated
push:
branches: [ beta ]
# 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: [ opened, synchronize ]
jobs:
conflicts:
runs-on: ubuntu-latest
permissions:
contents: read
pull-requests: write
steps:
- name: Update PRs with conflict labels
uses: eps1lon/actions-label-merge-conflict@releases/2.x
with:
dirtyLabel: "Merge Conflicts"
#removeOnDirtyLabel: "PR: ready to ship"
repoToken: "${{ secrets.GITHUB_TOKEN }}"
commentOnDirty: "This pull request has conflicts with the base branch \"beta\". Please resolve those so we can test out your changes."
commentOnClean: "Conflicts have been resolved! 🎉"