Skip to content

jsoncpp-vc140-static-32_64/1.8.0, JsonCpp.Windows/1.9.2, NETStandard.Library.NETFramework/2.0.0-preview2-25405-01, React.Core/3.2.0, React.Core/3.3.0, React.Core/3.4.1, React.Web/3.2.0, React.Web/3.3.0, React.Web/3.4.1, React.Web.Mvc4/3.2.0, React.Web.Mvc4/3.3.0, React.Web.Mvc4/3.4.1, Rx-Main/1.0.10621, Rx-Main/1.0.11226 #47605

jsoncpp-vc140-static-32_64/1.8.0, JsonCpp.Windows/1.9.2, NETStandard.Library.NETFramework/2.0.0-preview2-25405-01, React.Core/3.2.0, React.Core/3.3.0, React.Core/3.4.1, React.Web/3.2.0, React.Web/3.3.0, React.Web/3.4.1, React.Web.Mvc4/3.2.0, React.Web.Mvc4/3.3.0, React.Web.Mvc4/3.4.1, Rx-Main/1.0.10621, Rx-Main/1.0.11226

jsoncpp-vc140-static-32_64/1.8.0, JsonCpp.Windows/1.9.2, NETStandard.Library.NETFramework/2.0.0-preview2-25405-01, React.Core/3.2.0, React.Core/3.3.0, React.Core/3.4.1, React.Web/3.2.0, React.Web/3.3.0, React.Web/3.4.1, React.Web.Mvc4/3.2.0, React.Web.Mvc4/3.3.0, React.Web.Mvc4/3.4.1, Rx-Main/1.0.10621, Rx-Main/1.0.11226 #47605

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: