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

[BUGFIX] Fix minor spelling errors #377

Merged
merged 2 commits into from
May 8, 2024

Conversation

sandoba
Copy link
Contributor

@sandoba sandoba commented May 7, 2024

No description provided.

@sandoba sandoba changed the title Fix minor spelling errors [BUGFIX] Fix minor spelling errors May 7, 2024
Copy link
Contributor

@brotkrueml brotkrueml left a comment

Choose a reason for hiding this comment

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

@sandoba Thanks for your contribution. I have a remark.

Documentation/Major/Index.rst Outdated Show resolved Hide resolved
@brotkrueml brotkrueml merged commit a1d7ce4 into TYPO3-Documentation:main May 8, 2024
2 checks passed
Copy link

github-actions bot commented May 8, 2024

The backport to 11.5 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 991c103... Fix minor spelling errors
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/Major/Index.rst
CONFLICT (content): Merge conflict in Documentation/Major/Index.rst
Auto-merging Documentation/Major/PreupgradeTasks/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-11.5 11.5
# Navigate to the new working tree
cd .worktrees/backport-11.5
# Create a new branch
git switch --create backport-377-to-11.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 991c10396e9629a85b30a8d8f75d60792589ba8a,fd2c50014c86a631e1da71db9655e7c4e92f99d6
# Push it to GitHub
git push --set-upstream origin backport-377-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-377-to-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