TYPO3-Documentation / TYPO3CMS-Tutorial-SitePackage

Tutorial how to create a TYPO3 site package extension from scratch
https://docs.typo3.org/m/typo3/tutorial-sitepackage/master/en-us/
2 stars 49 forks source link

[TASK] Apply manual standards for new rendering #155

Closed linawolf closed 7 months ago

linawolf commented 7 months ago

Content of Includes.rst.txt is not neeeded anymore screenshots.json deleted

Add make test-docs for faster test

github-actions[bot] commented 7 months ago

The backport to 11.5 failed:

The process '/usr/bin/git' failed with exit code 1
stderr ``` error: could not apply 9d87f11... [TASK] Apply manual standards for new rendering hint: After resolving the conflicts, mark them with hint: "git add/rm ", 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/screenshots.json deleted in 9d87f11 ([TASK] Apply manual standards for new rendering) and modified in HEAD. Version HEAD of Documentation/screenshots.json 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-11.5 11.5
# Navigate to the new working tree
cd .worktrees/backport-11.5
# Create a new branch
git switch --create backport-155-to-11.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 9d87f115917584517cd298abd8c0e386afefc89c
# Push it to GitHub
git push --set-upstream origin backport-155-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-155-to-11.5.