Skip to content

Conversation

@iwillenbrock
Copy link
Contributor

Reordered sections to show the safer and more preferable way first

Reordered sections to show the safer and more preferable way first
Added link to the deployment information for locally developed sites
@linawolf linawolf merged commit 9e1033a into TYPO3-Documentation:main Aug 8, 2025
7 checks passed
@github-actions
Copy link
Contributor

github-actions bot commented Aug 8, 2025

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 64212d9... Update DeployTYPO3.rst
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"

stdout
Auto-merging Documentation/Installation/DeployTYPO3.rst
CONFLICT (content): Merge conflict in Documentation/Installation/DeployTYPO3.rst

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-12.4 12.4
# Navigate to the new working tree
cd .worktrees/backport-12.4
# Create a new branch
git switch --create backport-745-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 64212d9c5694da83a10844854cb61e6ffca3cb8b,80d556d7bfa5224053cd212538fbe47c6a0861b9
# Push it to GitHub
git push --set-upstream origin backport-745-to-12.4
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-12.4

Then, create a pull request where the base branch is 12.4 and the compare/head branch is backport-745-to-12.4.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants