Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix wrong typolink syntax #795

Merged
merged 1 commit into from
Sep 11, 2023
Merged

Conversation

kitzberger
Copy link
Contributor

The section parameter for typolink is not prefixed with a "c" in the database, that "c" is added during FE rendering.

The section parameter for typolink is not prefixed with a "c" in the database, that "c" is added during FE rendering.
@brotkrueml
Copy link
Contributor

@kitzberger Good catch! Thanks for your contribution 👍

@brotkrueml brotkrueml merged commit 913fc4a into TYPO3-Documentation:main Sep 11, 2023
2 checks passed
@github-actions
Copy link
Contributor

The backport to 11.5 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply e191de4... Fix wrong typolink syntax
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/Functions/Typolink.rst
CONFLICT (content): Merge conflict in Documentation/Functions/Typolink.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-795-to-11.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick e191de46b08e13f7ef5938738f58c331ba53db5e
# Push it to GitHub
git push --set-upstream origin backport-795-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-795-to-11.5.

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.

2 participants