[TASK] Document carousel Content Block

[linawolf]

Releases: main, 13.4

[github-actions]

The backport to 13.4 failed:

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

stderr

error: could not apply d34ddba... [TASK] Document carousel
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

[backport-340-to-13.4 4a3e426] [TASK] Document carousel
 Author: lina.wolf <[email protected]>
 Date: Sun Dec 22 22:40:46 2024 +0100
 2 files changed, 136 insertions(+), 2 deletions(-)
 create mode 100644 Documentation/ContentBlocks/Carousel.rst
Auto-merging Documentation/CodeSnippets/my_site_package/ContentBlocks/ContentElements/carousel/templates/backend-preview.html
CONFLICT (content): Merge conflict in Documentation/CodeSnippets/my_site_package/ContentBlocks/ContentElements/carousel/templates/backend-preview.html
Auto-merging Documentation/CodeSnippets/my_site_package/Resources/Private/Language/locallang.xlf
CONFLICT (content): Merge conflict in Documentation/CodeSnippets/my_site_package/Resources/Private/Language/locallang.xlf
Auto-merging Documentation/CodeSnippets/my_site_package/Resources/Private/Language/locallang_be.xlf
CONFLICT (content): Merge conflict in Documentation/CodeSnippets/my_site_package/Resources/Private/Language/locallang_be.xlf
Auto-merging Documentation/CodeSnippets/my_site_package/Resources/Private/Language/locallang_db.xlf
CONFLICT (content): Merge conflict in Documentation/CodeSnippets/my_site_package/Resources/Private/Language/locallang_db.xlf

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-13.4 13.4
# Navigate to the new working tree
cd .worktrees/backport-13.4
# Create a new branch
git switch --create backport-340-to-13.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick e8920ce6e2a1d3ea2f4d1f602aadb876692d19cb,d34ddba9263786d8ba2b8993f84e995d29097f8a,e4b100e3286e7759bf70e73cabe6c83604fe6477,7710be502c9fada80eba1d1f59e45e2abf5e9464,012f08f028638514ad991e6b609889a771457eba,bc343ad982b82d2de27d0ef1fd5f3c5afcb877fa
# Push it to GitHub
git push --set-upstream origin backport-340-to-13.4
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-13.4

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