Skip to content

[TASK] Use lightboxes and galleries for screenshots#776

Merged
linawolf merged 1 commit intomainfrom
task/gallery
Feb 6, 2026
Merged

[TASK] Use lightboxes and galleries for screenshots#776
linawolf merged 1 commit intomainfrom
task/gallery

Conversation

@linawolf
Copy link
Member

@linawolf linawolf commented Feb 6, 2026

Releases: main, 13.4

@linawolf linawolf merged commit ce851b8 into main Feb 6, 2026
6 checks passed
@linawolf linawolf deleted the task/gallery branch February 6, 2026 07:05
@github-actions
Copy link
Contributor

github-actions bot commented Feb 6, 2026

The backport to 13.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 54d8656... [TASK] Use lightboxes and galleries for screenshots
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/Administration/BackendUsers/Administrator.rst
CONFLICT (content): Merge conflict in Documentation/Administration/BackendUsers/Administrator.rst
CONFLICT (modify/delete): Documentation/Administration/BackendUsers/Groups.rst deleted in HEAD and modified in 54d8656 ([TASK] Use lightboxes and galleries for screenshots).  Version 54d8656 ([TASK] Use lightboxes and galleries for screenshots) of Documentation/Administration/BackendUsers/Groups.rst left in tree.
Auto-merging Documentation/Concepts/Backend/AdminTools/Index.rst
Auto-merging Documentation/Concepts/Backend/PageModule/Index.rst
Auto-merging Documentation/Concepts/Backend/SiteManagement/TypoScript.rst
Auto-merging Documentation/Concepts/TypoScript/Index.rst
CONFLICT (content): Merge conflict in Documentation/Concepts/TypoScript/Index.rst
Auto-merging Documentation/FirstProject/CreateRootPage.rst
CONFLICT (content): Merge conflict in Documentation/FirstProject/CreateRootPage.rst
Auto-merging Documentation/FirstProject/CreateSitePackage.rst
Auto-merging Documentation/FirstProject/Settings.rst
Auto-merging Documentation/FirstProject/SiteManagement/Index.rst
Auto-merging Documentation/ProjectTemplates/GitLabTemplate/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-776-to-13.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 54d86563143e9b9a883ac16117fcf4d64c6981cf
# Push it to GitHub
git push --set-upstream origin backport-776-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-776-to-13.4.

linawolf added a commit that referenced this pull request Feb 6, 2026
Releases: main, 13.4

(cherry picked from commit ce851b8)
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.

1 participant