TYPO3-Documentation / TYPO3CMS-Reference-Typoscript

The TypoScript Reference (TSref) is a true reference describing the core Content Objects and functions available for Template building using the TypoScript template engine.
https://docs.typo3.org/m/typo3/reference-typoscript/master/en-us/
11 stars 172 forks source link

Add more explaination for TS:data SiteLanguage:locale #1409 #1413

Closed froemken closed 4 weeks ago

github-actions[bot] commented 4 weeks ago

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr ``` error: could not apply 21d0c345... Add more explaination for TS:data SiteLanguage:locale #1409 hint: After resolving the conflicts, mark them with hint: "git add/rm ", 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/Functions/Data.rst CONFLICT (content): Merge conflict in Documentation/Functions/Data.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-1413-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 21d0c3455f6f86b6a2ae2f66ecbd9aa1e151e9a8,868e9d47702c2eafad50341cf3ae80a2cd8b9d2a
# Push it to GitHub
git push --set-upstream origin backport-1413-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-1413-to-12.4.