[TASK] Update after changes to site package

[linawolf]

No description provided.

[github-actions]

The backport to 12.4 failed:

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

stderr

error: could not apply 5d65e05... [TASK] Update CodeSnippets
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/CodeSnippets/ExtensionConfiguration/SitePackage-page-tsconfig.rst.txt deleted in HEAD and modified in 5d65e05 ([TASK] Update CodeSnippets).  Version 5d65e05 ([TASK] Update CodeSnippets) of Documentation/CodeSnippets/ExtensionConfiguration/SitePackage-page-tsconfig.rst.txt left in tree.
CONFLICT (modify/delete): Documentation/CodeSnippets/ExtensionConfiguration/SitePackage-settings-definitions-yaml.rst.txt deleted in HEAD and modified in 5d65e05 ([TASK] Update CodeSnippets).  Version 5d65e05 ([TASK] Update CodeSnippets) of Documentation/CodeSnippets/ExtensionConfiguration/SitePackage-settings-definitions-yaml.rst.txt left in tree.
CONFLICT (modify/delete): Documentation/CodeSnippets/ExtensionConfiguration/SitePackage-settings.rst.txt deleted in HEAD and modified in 5d65e05 ([TASK] Update CodeSnippets).  Version 5d65e05 ([TASK] Update CodeSnippets) of Documentation/CodeSnippets/ExtensionConfiguration/SitePackage-settings.rst.txt left in tree.
CONFLICT (modify/delete): Documentation/CodeSnippets/Fluid/Header.rst.txt deleted in HEAD and modified in 5d65e05 ([TASK] Update CodeSnippets).  Version 5d65e05 ([TASK] Update CodeSnippets) of Documentation/CodeSnippets/Fluid/Header.rst.txt left in tree.
CONFLICT (modify/delete): Documentation/CodeSnippets/Fluid/Image.rst.txt deleted in HEAD and modified in 5d65e05 ([TASK] Update CodeSnippets).  Version 5d65e05 ([TASK] Update CodeSnippets) of Documentation/CodeSnippets/Fluid/Image.rst.txt left in tree.
CONFLICT (modify/delete): Documentation/CodeSnippets/Fluid/Menu.rst.txt deleted in HEAD and modified in 5d65e05 ([TASK] Update CodeSnippets).  Version 5d65e05 ([TASK] Update CodeSnippets) of Documentation/CodeSnippets/Fluid/Menu.rst.txt left in tree.
CONFLICT (modify/delete): Documentation/CodeSnippets/Fluid/MenuSitemap.rst.txt deleted in HEAD and modified in 5d65e05 ([TASK] Update CodeSnippets).  Version 5d65e05 ([TASK] Update CodeSnippets) of Documentation/CodeSnippets/Fluid/MenuSitemap.rst.txt left in tree.
CONFLICT (modify/delete): Documentation/CodeSnippets/Fluid/MenuSubpages.rst.txt deleted in HEAD and modified in 5d65e05 ([TASK] Update CodeSnippets).  Version 5d65e05 ([TASK] Update CodeSnippets) of Documentation/CodeSnippets/Fluid/MenuSubpages.rst.txt left in tree.
Auto-merging Documentation/CodeSnippets/Fluid/TemplateDefault.rst.txt
CONFLICT (content): Merge conflict in Documentation/CodeSnippets/Fluid/TemplateDefault.rst.txt
Auto-merging Documentation/CodeSnippets/codesnippets.php
CONFLICT (content): Merge conflict in Documentation/CodeSnippets/codesnippets.php

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-303-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 5d65e05f69784f99dd00b671e34b4eab03f0800d,19c5e5affdb2a1777df4c07ad8cf9a4b464dbca5
# Push it to GitHub
git push --set-upstream origin backport-303-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-303-to-12.4.

[github-actions]

The backport to 13.4 failed:

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

stderr

error: could not apply 19c5e5a... [TASK] Update after changes to site package
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

[backport-303-to-13.4 d3b0aff] [TASK] Update CodeSnippets
 Author: lina.wolf <[email protected]>
 Date: Sun Dec 8 08:39:11 2024 +0100
 10 files changed, 48 insertions(+), 50 deletions(-)
CONFLICT (modify/delete): Documentation/CodeSnippets/ExtensionConfiguration/SitePackage-settings.yaml deleted in HEAD and modified in 19c5e5a ([TASK] Update after changes to site package).  Version 19c5e5a ([TASK] Update after changes to site package) of Documentation/CodeSnippets/ExtensionConfiguration/SitePackage-settings.yaml left in tree.
Auto-merging Documentation/CodeSnippets/Fluid/Layout.rst.txt
CONFLICT (content): Merge conflict in Documentation/CodeSnippets/Fluid/Layout.rst.txt
Auto-merging Documentation/ContentMapping/Index.rst
Auto-merging Documentation/FluidTemplates/Index.rst
CONFLICT (content): Merge conflict in Documentation/FluidTemplates/Index.rst
Auto-merging Documentation/FluidTemplates/_codesnippets/_DefaultWithPartials.html
Auto-merging Documentation/FluidTemplates/_codesnippets/_DefaultWithSection.html
Auto-merging Documentation/FluidTemplates/_codesnippets/_SubpageWithSection.html
Auto-merging Documentation/FluidTemplates/_codesnippets/_move_content_to_section.diff
CONFLICT (content): Merge conflict in Documentation/FluidTemplates/_codesnippets/_move_content_to_section.diff
Auto-merging Documentation/NextSteps/Index.rst
CONFLICT (content): Merge conflict in Documentation/NextSteps/Index.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-13.4 13.4
# Navigate to the new working tree
cd .worktrees/backport-13.4
# Create a new branch
git switch --create backport-303-to-13.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 5d65e05f69784f99dd00b671e34b4eab03f0800d,19c5e5affdb2a1777df4c07ad8cf9a4b464dbca5
# Push it to GitHub
git push --set-upstream origin backport-303-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-303-to-13.4.