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] Resolve todos in HtmlparserTags chapter #1066

Merged

Conversation

brotkrueml
Copy link
Contributor

@brotkrueml brotkrueml merged commit 8aeda65 into TYPO3-Documentation:main Feb 9, 2024
2 checks passed
@brotkrueml brotkrueml deleted the htmlparsertags-resolve-todos branch February 9, 2024 16:15
Copy link
Contributor

github-actions bot commented Feb 9, 2024

The backport to 11.5 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply fd16e7cf... [TASK] Resolve todos in HtmlparserTags 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
Auto-merging Documentation/Functions/HtmlparserTags.rst
CONFLICT (content): Merge conflict in Documentation/Functions/HtmlparserTags.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-1066-to-11.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick fd16e7cf96242dfd6cd86cb432635aedec6c0dc4
# Push it to GitHub
git push --set-upstream origin backport-1066-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-1066-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