sarah-missing-typoscriptmultiple

[sarahmccarthy123]

No description provided.

[sarahmccarthy123]

This is to deal with issue: TYPO3-Documentation/TYPO3CMS-Reference-Typoscript#518

[github-actions]

The backport to 11.5 failed:

The process '/usr/bin/git' failed with exit code 1

stderr

error: could not apply 6d4e0d36... Make multiple condition syntax more obvious
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 advice.mergeConflict false"

stdout

CONFLICT (modify/delete): Documentation/Configuration/TypoScript/Syntax/Conditions/Index.rst deleted in HEAD and modified in 6d4e0d36 (Make multiple condition syntax more obvious).  Version 6d4e0d36 (Make multiple condition syntax more obvious) of Documentation/Configuration/TypoScript/Syntax/Conditions/Index.rst left in tree.

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-11.5 11.5
# Navigate to the new working tree
cd .worktrees/backport-11.5
# Create a new branch
git switch --create backport-4452-to-11.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 6d4e0d369f37b9dbebf28ff8fea9265fdf685fd6
# Push it to GitHub
git push --set-upstream origin backport-4452-to-11.5
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-11.5

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