Skip to content

EntityFramework/4.1.10311, hljs/6.2.3, opensslkey/1.3.0.20130622, Prism.StoreApps/2.0.0, python/3.11.0, RPSInstall/1.0.0, T4Scaffolding/1.0.5, term-canvas/0.0.5, tonyg-rfc3339/0.1, Wave/5.0.0 #47422

EntityFramework/4.1.10311, hljs/6.2.3, opensslkey/1.3.0.20130622, Prism.StoreApps/2.0.0, python/3.11.0, RPSInstall/1.0.0, T4Scaffolding/1.0.5, term-canvas/0.0.5, tonyg-rfc3339/0.1, Wave/5.0.0

EntityFramework/4.1.10311, hljs/6.2.3, opensslkey/1.3.0.20130622, Prism.StoreApps/2.0.0, python/3.11.0, RPSInstall/1.0.0, T4Scaffolding/1.0.5, term-canvas/0.0.5, tonyg-rfc3339/0.1, Wave/5.0.0 #47422

name: "Check for conflicts"
on:
push:
branches:
- main
pull_request_target:
jobs:
main:
runs-on: ubuntu-latest
steps:
- name: check if PRs have conflicts
uses: eps1lon/actions-label-merge-conflict@v3
with:
dirtyLabel: "merge conflict"
repoToken: "${{ secrets.GITHUB_TOKEN }}"
retryAfter: 10
commentOnClean: |
@${{github.actor}}
Conflicts have been resolved. :thumbsup: