Skip to content

[release-2.6] chore: upgrade paths-filter #1148

[release-2.6] chore: upgrade paths-filter

[release-2.6] chore: upgrade paths-filter #1148

name: Merge Conflict Finder
on:
push:
branches:
- master
- release-*
pull_request:
branches:
- master
- release-*
permissions: read-all
jobs:
merge_conflict_job:
runs-on: ubuntu-latest
name: Find merge conflicts
steps:
# Checkout the source code so there are some files to look at.
- uses: actions/checkout@v2
# Run the actual merge conflict finder
- name: Merge Conflict finder
uses: olivernybroe/action-conflict-finder@v4.0