Skip to content

[Backport release-1.30] Backport etcd join workflow fix from #5151 #2962

[Backport release-1.30] Backport etcd join workflow fix from #5151

[Backport release-1.30] Backport etcd join workflow fix from #5151 #2962

Workflow file for this run

name: Check for merge conflicts
on:
push:
branches:
- main
- release-*
pull_request_target:
types:
- opened
- reopened
- synchronize
branches:
- main
- release-*
permissions:
contents: read
pull-requests: write
jobs:
main:
runs-on: ubuntu-latest
steps:
- name: Check for merge conflicts
uses: eps1lon/[email protected]
with:
repoToken: ${{ secrets.GITHUB_TOKEN }}
dirtyLabel: merge-conflict
commentOnDirty: This pull request has merge conflicts that need to be resolved.