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

[TASK] Split up "Help within TYPO3" chapter #161

Merged
merged 1 commit into from
Apr 8, 2024
Merged

Conversation

brotkrueml
Copy link
Contributor

Previously, the keyboard commands were already on a separate page which was displayed as a link at the bottom of the help page and can easily overlooked. As the keyboard commands chapter is already a bit longer, the other topics have been moved to separate pages (instead of integrating the keyboard commands into the existing page). This also leaves room for improvement of each topic.

Releases: main, 12.4

Previously, the keyboard commands were already a separate page which was displayed as a link at the bottom of a page and can easily overlooked.
As the keyboard commands chapter is already a bit longer, the other topics have been moved to separate pages (instead of integrating the keyboard commands into the existing page).
This also leaves room for improvement of each topic.

Releases: main, 12.4
@brotkrueml brotkrueml merged commit 8c64bea into main Apr 8, 2024
2 checks passed
@brotkrueml brotkrueml deleted the split-up-help branch April 8, 2024 17:06
Copy link

github-actions bot commented Apr 8, 2024

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 7a2aaa4... [TASK] Split up "Help within TYPO3" chapter
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
CONFLICT (modify/delete): Documentation/Localization.ru_RU/HelpInside/Index.rst deleted in HEAD and modified in 7a2aaa4 ([TASK] Split up "Help within TYPO3" chapter).  Version 7a2aaa4 ([TASK] Split up "Help within TYPO3" chapter) of Documentation/Localization.ru_RU/HelpInside/Index.rst left in tree.

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-161-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 7a2aaa439db689dab3c52e5cacf33632f99cd8f6
# Push it to GitHub
git push --set-upstream origin backport-161-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-161-to-12.4.

brotkrueml added a commit that referenced this pull request Apr 9, 2024
Previously, the keyboard commands were already a separate page which was displayed as a link at the bottom of a page and can easily overlooked.
As the keyboard commands chapter is already a bit longer, the other topics have been moved to separate pages (instead of integrating the keyboard commands into the existing page).
This also leaves room for improvement of each topic.

Releases: main, 12.4
brotkrueml added a commit that referenced this pull request Apr 9, 2024
Previously, the keyboard commands were already a separate page which was displayed as a link at the bottom of a page and can easily overlooked.
As the keyboard commands chapter is already a bit longer, the other topics have been moved to separate pages (instead of integrating the keyboard commands into the existing page).
This also leaves room for improvement of each topic.

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