Label Conflicting PRs #2086

	name: Label Conflicting PRs

	on:
	# Run AFTER auto-rebase finishes, not in parallel with it.
	# This ensures we only label PRs that auto-rebase could NOT fix
	# (real conflicts), avoiding false-alarm notifications.
	workflow_run:
	workflows: ["Auto Rebase PRs"]
	types: [completed]
	# Also run when a contributor pushes to their PR branch
	pull_request_target:
	types: [synchronize]

	permissions:
	contents: read
	pull-requests: write

	jobs:
	check:
	name: Detect merge conflicts
	runs-on: ubuntu-latest
	timeout-minutes: 30
	steps:
	- uses: eps1lon/actions-label-merge-conflict@v3
	with:
	dirtyLabel: "needs-rebase"
	repoToken: "${{ secrets.GITHUB_TOKEN }}"
	retryAfter: 120
	retryMax: 5
	continueOnMissingPermissions: true
	commentOnDirty: \|
	This PR has merge conflicts with `master`.

	Please rebase your branch:
	```bash
	# Add upstream remote (one-time setup)
	git remote add upstream https://github.com/sugarlabs/musicblocks.git

	# Fetch latest master and rebase
	git fetch upstream
	git rebase upstream/master

	# Resolve any conflicts, then:
	git push --force-with-lease origin YOUR_BRANCH
	```

	> Tip: Enable "Allow edits from maintainers" on this PR so we can auto-rebase for you next time. This only grants access to your PR branch. Your fork's other branches are not affected.
	commentOnClean: ""

Provide feedback