Skip to content

AAD.fs/3.0.46, AAD.fs/6.1.66, AAD.Suave/3.0.46, AAD.Suave/6.1.66, AcisRestSDK/1.0.4.525, AlibabaCloud.DarabonbaEncodeUtil/0.0.2, AlibabaCloud.DarabonbaSignatureUtil/0.0.4, AlibabaCloud.OpenApiUtil/1.1.1, Angular-AppInsights/1.0.0, angular-ui-date/0.0.8, angular-ui-switch/0.1.1, angularjs/1.6.6, angularjs/1.6.5, angularjs/1.5.3, angularjs/1.5.7 #44886

AAD.fs/3.0.46, AAD.fs/6.1.66, AAD.Suave/3.0.46, AAD.Suave/6.1.66, AcisRestSDK/1.0.4.525, AlibabaCloud.DarabonbaEncodeUtil/0.0.2, AlibabaCloud.DarabonbaSignatureUtil/0.0.4, AlibabaCloud.OpenApiUtil/1.1.1, Angular-AppInsights/1.0.0, angular-ui-date/0.0.8, angular-ui-switch/0.1.1, angularjs/1.6.6, angularjs/1.6.5, angularjs/1.5.3, angularjs/1.5.7

AAD.fs/3.0.46, AAD.fs/6.1.66, AAD.Suave/3.0.46, AAD.Suave/6.1.66, AcisRestSDK/1.0.4.525, AlibabaCloud.DarabonbaEncodeUtil/0.0.2, AlibabaCloud.DarabonbaSignatureUtil/0.0.4, AlibabaCloud.OpenApiUtil/1.1.1, Angular-AppInsights/1.0.0, angular-ui-date/0.0.8, angular-ui-switch/0.1.1, angularjs/1.6.6, angularjs/1.6.5, angularjs/1.5.3, angularjs/1.5.7 #44886

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: