merge_tools: preserve executable bit on resolve #1620

	name: website

	on:
	push:
	branches:
	- main

	permissions:
	contents: write

	jobs:
	prerelease-docs-build-deploy:
	if: github.repository_owner == 'martinvonz' # Stops this job from running on forks
	strategy:
	matrix:
	os: [ubuntu-latest]
	runs-on: ${{ matrix.os }}

	steps:
	- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
	- run: "git fetch origin gh-pages --depth=1"
	- uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b
	with:
	python-version: 3.11
	- name: Install uv
	uses: astral-sh/setup-uv@180f8b44399608a850e1db031fa65c77746566d3
	with:
	version: "0.5.1"
	- name: Install dependencies, compile and deploy docs
	run: \|
	git config user.name 'jj-docs[bot]'
	git config user.email 'jj-docs[bot]@users.noreply.github.io'
	.github/scripts/docs-build-deploy 'https://jj-vcs.github.io/jj' prerelease --push
	- name: "Show `git diff --stat`"
	run: git diff --stat gh-pages^ gh-pages \|\| echo "(No diffs)"

Provide feedback