Merge #6370: backport: merge bitcoin#23499, #23832, #24136, #24265, #… #6469

	name: Check Merge Fast-Forward Only

	permissions:
	pull-requests: write

	on:
	push:
	pull_request_target:
	pull_request_review:
	types: [submitted]

	jobs:
	check_merge:
	runs-on: ubuntu-latest
	steps:
	- name: Checkout repository
	uses: actions/checkout@v3
	with:
	fetch-depth: 0

	- name: Set up Git
	run: \|
	git config user.name "GitHub Action"
	git config user.email "[email protected]"

	- name: Check merge --ff-only
	run: \|
	git fetch origin master:master
	if [[ "${{ github.event_name }}" == "pull_request"* ]]; then
	git fetch origin ${{ github.event.pull_request.base.ref }}:base_branch
	git checkout base_branch
	git pull --rebase=false origin pull/${{ github.event.pull_request.number }}/head
	git checkout master
	git merge --ff-only base_branch
	else
	git checkout master
	git merge --ff-only ${{ github.sha }}
	fi

	- name: add labels
	uses: actions-ecosystem/action-add-labels@v1
	if: failure()
	with:
	labels: \|
	needs rebase

	- name: comment
	uses: mshick/add-pr-comment@v2
	if: failure()
	with:
	message: \|
	This pull request has conflicts, please rebase.

Provide feedback