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

[FEATURE] #97667 - Add keyboard support for Multiselect #162

Merged
merged 3 commits into from
Apr 10, 2024

Conversation

brotkrueml
Copy link
Contributor

As this manual is for editors, the different types are explained by screenshots where the keyboard commands can be used.

Additionally, a TOC has been added.

Resolves: TYPO3-Documentation/Changelog-To-Doc#412
Releases: main, 12.4

As this manual is for editors, the different types are explained by screenshots where the keyboard commands can be used.

Resolves: TYPO3-Documentation/Changelog-To-Doc#412
Releases: main, 12.4
Copy link

@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.

(Not fully reviewed yet, out of time)

Documentation/HelpInside/KeyboardCommands/Index.rst Outdated Show resolved Hide resolved
@brotkrueml brotkrueml merged commit 4f55fa5 into main Apr 10, 2024
@brotkrueml brotkrueml deleted the feature-97667 branch April 10, 2024 05:10
Copy link

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 7c4a18b... [FEATURE] #97667 - Add keyboard support for Multiselect
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/KeyboardCommands/Index.rst deleted in HEAD and modified in 7c4a18b ([FEATURE] #97667 - Add keyboard support for Multiselect).  Version 7c4a18b ([FEATURE] #97667 - Add keyboard support for Multiselect) of Documentation/Localization.ru_RU/HelpInside/KeyboardCommands/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-162-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 7c4a18b10c097ff7f1a4cf8f404dc7787732747b,433df796697fd12f1ca4edb7eb8e666116159238,f9631a052eb3deddeb3ce48a125971f51f4ca7a9
# Push it to GitHub
git push --set-upstream origin backport-162-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-162-to-12.4.

brotkrueml added a commit that referenced this pull request Apr 11, 2024
As this manual is for editors, the different types are explained by screenshots where the keyboard commands can be used.

Resolves: TYPO3-Documentation/Changelog-To-Doc#412
Releases: main, 12.4
brotkrueml added a commit that referenced this pull request Apr 11, 2024
As this manual is for editors, the different types are explained by screenshots where the keyboard commands can be used.

Resolves: TYPO3-Documentation/Changelog-To-Doc#412
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.

[FEATURE] Add keyboard support for Multiselect
3 participants