Bump electron-builder from 26.16.1 to 26.17.0 #14699

	name: "Conflicts"
Check warning on line 1 in .github/workflows/conflicts.yml View workflow run for this annotation GitHub Actions / Conflicts Workflow execution policy warning (evaluate mode) On November 2, 2026, GitHub will restrict `pull_request_target` on public repositories by default. To continue allowing the event trigger, configure an Actions policy. Learn more: https://gh.io/securely-using-pull_request_target#default-policy-for-pull_request_target
	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]

	cache-mode: none
	permissions: {}

	concurrency:
	group: ${{ github.workflow }}-${{ github.event.pull_request.number \|\| github.ref }}
	cancel-in-progress: true

	jobs:
	main:
	name: Check for conflicts
	runs-on: ubuntu-slim

	permissions:
	pull-requests: write

	steps:
	- name: check if prs are dirty
	uses: eps1lon/actions-label-merge-conflict@0273be72a0bbd58fcd71d0d6c02c209b50d1e5e1 #v3.1.0
	with:
	dirtyLabel: "PR: merge conflicts / rebase needed"
	removeOnDirtyLabel: "PR: waiting for review"
	repoToken: "${{ secrets.GITHUB_TOKEN }}"
	commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."
	commentOnClean: "Conflicts have been resolved. A maintainer will review the pull request shortly."

Navigation Menu