Skip to content
This repository has been archived by the owner on Nov 19, 2024. It is now read-only.

Fix "itemsLimitPerTable" / "itemsLimitSingleTable" ranges and clarify… #565

Merged
merged 1 commit into from
Nov 17, 2024

Conversation

@linawolf
Copy link
Member

Thank you for clarifying this! It seems like we can also backport this to 13.4 and 12.4

@linawolf linawolf merged commit 851bc6f into TYPO3-Documentation:main Nov 17, 2024
4 checks passed
Copy link
Contributor

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 3921448... Fix "itemsLimitPerTable" / "itemsLimitSingleTable" ranges and clarify interactions with TCA "maxDBListItems" / "maxSingleDBListItems"
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
Auto-merging Documentation/PageTsconfig/Mod/WebList.rst
CONFLICT (content): Merge conflict in Documentation/PageTsconfig/Mod/WebList.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-565-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 392144829faa85b53716b30398f331a61951bfb3
# Push it to GitHub
git push --set-upstream origin backport-565-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-565-to-12.4.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants