This repository has been archived by the owner on Jan 5, 2024. It is now read-only.

Merge branch 'main' into bugfix/250 #419

	name: "PR Conflicts Tip"
	on:
	# So that PRs touching the same files as the push are updated
	push:
	# So that the `dirtyLabel` is removed if conflicts are resolve
	# We recommend `pull_request_target` so that github secrets are available.
	# In `pull_request` we wouldn't be able to change labels of fork PRs
	pull_request_target:
	types: [synchronize]

	jobs:
	main:
	runs-on: ubuntu-latest
	steps:
	- name: check if prs are dirty
	uses: eps1lon/actions-label-merge-conflict@releases/2.x
	with:
	dirtyLabel: "PR/conflict"
	removeOnDirtyLabel: "PR/conflict"
	repoToken: "${{ secrets.GITHUB_TOKEN }}"
	commentOnDirty: "此拉请求有冲突，请解决这些之前，我们可以评估拉请求。"
	commentOnClean: "冲突已经解决。维护人员将很快检查拉请求。"

Provide feedback