Merge pull request #2200 from microsoft/u/christiano/fix-redirect-han… #1560

	# This is a basic workflow to help you get started with Actions

	name: PullRequestConflicting

	# Controls when the action will run. Triggers the workflow on push or pull request
	# events but only for the master branch
	on:
	push:
	branches: [ main ]
	pull_request_target:
	types: [opened, reopened, synchronize]
	branches: [ main ]

	permissions:
	pull-requests: write
	contents: read

	# A workflow run is made up of one or more jobs that can run sequentially or in parallel
	jobs:
	# This workflow contains a single job for labeling pull requests with merge conflicts
	label-merge-conflicts:
	# The type of runner that the job will run on
	runs-on: ubuntu-latest

	# Steps represent a sequence of tasks that will be executed as part of the job
	steps:
	- name: check merge conflicts
	uses: eps1lon/actions-label-merge-conflict@0273be72a0bbd58fcd71d0d6c02c209b50d1e5e1 # v3.1.0
	id: check
	with:
	dirtyLabel: "conflicting"
	repoToken: "${{ secrets.GITHUB_TOKEN }}"
	continueOnMissingPermissions: true
	commentOnDirty: 'This pull request has conflicting changes, the author must resolve the conflicts before this pull request can be merged.'
	commentOnClean: 'Conflicts have been resolved. A maintainer will take a look shortly.'

Navigation Menu