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] Replace "t3-data-type" with "confval" #929

Merged

Conversation

brotkrueml
Copy link
Contributor

This is a preparation for switching to PHP-based documentation rendering.

Additionally, index is added for missing data types.

Releases: main, 12.4, 11.5

This is a preparation for switching to PHP-based documentation rendering.

Additionally, index is added for missing data types.

Releases: main, 12.4, 11.5
@brotkrueml brotkrueml merged commit fa77306 into TYPO3-Documentation:main Dec 17, 2023
2 checks passed
@brotkrueml brotkrueml deleted the replace-t3-data-type branch December 17, 2023 17:45
Copy link
Contributor

The backport to 11.5 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 0ee76d4... [TASK] Replace "t3-data-type" with "confval"
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/ContentObjects/Extbaseplugin/Index.rst deleted in HEAD and modified in 0ee76d4 ([TASK] Replace "t3-data-type" with "confval").  Version 0ee76d4 ([TASK] Replace "t3-data-type" with "confval") of Documentation/ContentObjects/Extbaseplugin/Index.rst left in tree.
Auto-merging Documentation/ContentObjects/Hmenu/Categories.rst
Auto-merging Documentation/ContentObjects/Image/Index.rst
Auto-merging Documentation/ContentObjects/UserAndUserInt/Index.rst
Auto-merging Documentation/DataTypes/Index.rst
CONFLICT (content): Merge conflict in Documentation/DataTypes/Index.rst
Auto-merging Documentation/Functions/Cache.rst
CONFLICT (content): Merge conflict in Documentation/Functions/Cache.rst
Auto-merging Documentation/Functions/Data.rst
Auto-merging Documentation/Functions/Encapslines.rst
CONFLICT (content): Merge conflict in Documentation/Functions/Encapslines.rst
Auto-merging Documentation/Functions/Htmlparser.rst
CONFLICT (content): Merge conflict in Documentation/Functions/Htmlparser.rst
Auto-merging Documentation/Functions/HtmlparserTags.rst
CONFLICT (content): Merge conflict in Documentation/Functions/HtmlparserTags.rst
Auto-merging Documentation/Functions/If.rst
CONFLICT (content): Merge conflict in Documentation/Functions/If.rst
Auto-merging Documentation/Functions/Imagelinkwrap.rst
CONFLICT (content): Merge conflict in Documentation/Functions/Imagelinkwrap.rst
Auto-merging Documentation/Functions/Imgresource.rst
CONFLICT (content): Merge conflict in Documentation/Functions/Imgresource.rst
Auto-merging Documentation/Functions/Makelinks.rst
CONFLICT (content): Merge conflict in Documentation/Functions/Makelinks.rst
Auto-merging Documentation/Functions/Numberformat.rst
CONFLICT (content): Merge conflict in Documentation/Functions/Numberformat.rst
Auto-merging Documentation/Functions/Parsefunc.rst
CONFLICT (content): Merge conflict in Documentation/Functions/Parsefunc.rst
Auto-merging Documentation/Functions/Replacement.rst
CONFLICT (content): Merge conflict in Documentation/Functions/Replacement.rst
Auto-merging Documentation/Functions/Round.rst
CONFLICT (content): Merge conflict in Documentation/Functions/Round.rst
Auto-merging Documentation/Functions/Select.rst
CONFLICT (content): Merge conflict in Documentation/Functions/Select.rst
Auto-merging Documentation/Functions/Split.rst
CONFLICT (content): Merge conflict in Documentation/Functions/Split.rst
Auto-merging Documentation/Functions/Stdwrap.rst
CONFLICT (content): Merge conflict in Documentation/Functions/Stdwrap.rst
Auto-merging Documentation/Functions/Strpad.rst
CONFLICT (content): Merge conflict in Documentation/Functions/Strpad.rst
Auto-merging Documentation/Functions/Tags.rst
CONFLICT (content): Merge conflict in Documentation/Functions/Tags.rst
Auto-merging Documentation/Functions/Typolink.rst
CONFLICT (content): Merge conflict in Documentation/Functions/Typolink.rst
Auto-merging Documentation/Gifbuilder/Properties.rst
Auto-merging Documentation/Settings.cfg
Auto-merging Documentation/Setup/Config/Index.rst
CONFLICT (content): Merge conflict in Documentation/Setup/Config/Index.rst
Auto-merging Documentation/Setup/Page/Index.rst
Auto-merging Documentation/TopLevelObjects/Plugin.rst
CONFLICT (content): Merge conflict in Documentation/TopLevelObjects/Plugin.rst
Auto-merging Documentation/UsingSetting/Constants.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-929-to-11.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 0ee76d4f6d6d6ae5b7fdfdf8855864d5decb673f
# Push it to GitHub
git push --set-upstream origin backport-929-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-929-to-11.5.

brotkrueml added a commit to brotkrueml/TYPO3CMS-Reference-Typoscript that referenced this pull request Dec 17, 2023
This is a preparation for switching to PHP-based documentation rendering.

Additionally, index is added for missing data types.

Releases: main, 12.4, 11.5
brotkrueml added a commit that referenced this pull request Dec 17, 2023
This is a preparation for switching to PHP-based documentation rendering.

Additionally, index is added for missing data types.

Releases: main, 12.4, 11.5
@brotkrueml brotkrueml added backport-done Changes have been backported to other branches already and removed backport failed labels Dec 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 12.4 backport-done Changes have been backported to other branches already
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants