Skip to content

Conversation

brosua
Copy link
Contributor

@brosua brosua commented Jul 16, 2025

Releases: main, 13.4, 12.4

Copy link
Contributor

@garvinhicking garvinhicking left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks so much for getting on this!

@garvinhicking garvinhicking self-assigned this Jul 16, 2025
@brosua brosua force-pushed the bugfix/site-language-locale branch from 6a49c46 to 2bff35d Compare July 16, 2025 13:38
@garvinhicking garvinhicking merged commit 8ed7e84 into TYPO3-Documentation:main Jul 18, 2025
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 2bff35d6... [TASK] Use of siteLanguage(“locale”) corrected
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/Conditions/Index.rst
CONFLICT (content): Merge conflict in Documentation/Conditions/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-12.4 12.4
# Navigate to the new working tree
cd .worktrees/backport-12.4
# Create a new branch
git switch --create backport-1591-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 2bff35d6ff44a577637cb0c806c2832972f39aca
# Push it to GitHub
git push --set-upstream origin backport-1591-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-1591-to-12.4.

garvinhicking pushed a commit that referenced this pull request Jul 18, 2025
@garvinhicking garvinhicking added backport-done Changes have been backported to other branches already and removed backport failed labels Jul 18, 2025
@garvinhicking
Copy link
Contributor

backported manually with 5b39cc2

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 12.4 backport 13.4 backport-done Changes have been backported to other branches already
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants