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

[TASK] Link supported languages page in TYPO3 Explained #399

Merged

Conversation

brotkrueml
Copy link
Contributor

Instead of referencing to a PHP file, link to the existing page "Supported languages" in TYPO3 Explained.

Releases: main, 12.4, 11.5

Instead of referencing to a PHP file, link to the existing page "Supported languages" in TYPO3 Explained.

Releases: main, 12.4, 11.5
@brotkrueml brotkrueml merged commit 63487bc into TYPO3-Documentation:main Nov 13, 2023
3 checks passed
@brotkrueml brotkrueml deleted the link-supported-languages branch November 13, 2023 12:56
Copy link
Contributor

The backport to 11.5 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply def9435... [TASK] Link supported languages page in TYPO3 Explained
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".

stdout
Auto-merging Documentation/UserTsconfig/Setup.rst
CONFLICT (content): Merge conflict in Documentation/UserTsconfig/Setup.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-11.5 11.5
# Navigate to the new working tree
cd .worktrees/backport-11.5
# Create a new branch
git switch --create backport-399-to-11.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick def9435a2e395e073fb320669d7fb0145d236b92
# Push it to GitHub
git push --set-upstream origin backport-399-to-11.5
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-11.5

Then, create a pull request where the base branch is 11.5 and the compare/head branch is backport-399-to-11.5.

brotkrueml added a commit that referenced this pull request Nov 13, 2023
…ed (#399)

Instead of referencing to a PHP file, link to the existing page "Supported languages" in TYPO3 Explained.

Releases: main, 12.4, 11.5
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