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] Move f:cobject examples into the reference #92

Merged
merged 1 commit into from
Mar 10, 2025
Merged

Conversation

linawolf
Copy link
Member

@linawolf linawolf commented Mar 6, 2025

Releases: main, 13.4

@froemken
Copy link

froemken commented Mar 7, 2025

I have no clue what happens here. Moving is OK for me, but deleting over 5000 lines and replacing them with ~100 lines, has nothing to do with "move". Maybe you can explain it a bit further.

@linawolf
Copy link
Member Author

linawolf commented Mar 7, 2025

The globaly.json was not supposed to be changed, I will make a follow up

@linawolf linawolf marked this pull request as draft March 7, 2025 19:42
@linawolf linawolf marked this pull request as ready for review March 10, 2025 12:01
@linawolf linawolf merged commit af844b0 into main Mar 10, 2025
2 checks passed
@linawolf linawolf deleted the task/cobject branch March 10, 2025 12:01
Copy link

The backport to 13.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 76f7ff7... [TASK] Use f:cobject with page-content data processor
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".
hint: Disable this message with "git config set advice.mergeConflict false"

stdout
Auto-merging Documentation/Global/CObject.rst
CONFLICT (content): Merge conflict in Documentation/Global/CObject.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-13.4 13.4
# Navigate to the new working tree
cd .worktrees/backport-13.4
# Create a new branch
git switch --create backport-92-to-13.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 76f7ff7dbd7314b0e79e8e38c486c2994432c318
# Push it to GitHub
git push --set-upstream origin backport-92-to-13.4
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-13.4

Then, create a pull request where the base branch is 13.4 and the compare/head branch is backport-92-to-13.4.

reviewtypo3org pushed a commit to TYPO3/typo3 that referenced this pull request Mar 13, 2025
The example section was moved into the ViewHelper Reference and
improved with TYPO3-Documentation/TYPO3CMS-Reference-ViewHelper#92

Resolves: #106348
Releases: main, 13.4
Change-Id: I309d38e20e741a42f4da009c4deed13abe7927a3
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/88555
Tested-by: core-ci <[email protected]>
Tested-by: Simon Praetorius <[email protected]>
Reviewed-by: Simon Praetorius <[email protected]>
Tested-by: Georg Ringer <[email protected]>
Reviewed-by: Georg Ringer <[email protected]>
Tested-by: Garvin Hicking <[email protected]>
TYPO3IncTeam pushed a commit to TYPO3-CMS/fluid that referenced this pull request Mar 13, 2025
The example section was moved into the ViewHelper Reference and
improved with TYPO3-Documentation/TYPO3CMS-Reference-ViewHelper#92

Resolves: #106348
Releases: main, 13.4
Change-Id: I309d38e20e741a42f4da009c4deed13abe7927a3
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/88555
Tested-by: core-ci <[email protected]>
Tested-by: Simon Praetorius <[email protected]>
Reviewed-by: Simon Praetorius <[email protected]>
Tested-by: Georg Ringer <[email protected]>
Reviewed-by: Georg Ringer <[email protected]>
Tested-by: Garvin Hicking <[email protected]>
reviewtypo3org pushed a commit to TYPO3/typo3 that referenced this pull request Mar 13, 2025
The example section was moved into the ViewHelper Reference and
improved with TYPO3-Documentation/TYPO3CMS-Reference-ViewHelper#92

Resolves: #106348
Releases: main, 13.4
Change-Id: I309d38e20e741a42f4da009c4deed13abe7927a3
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/88555
Tested-by: core-ci <[email protected]>
Tested-by: Simon Praetorius <[email protected]>
Reviewed-by: Simon Praetorius <[email protected]>
Tested-by: Georg Ringer <[email protected]>
Reviewed-by: Georg Ringer <[email protected]>
Tested-by: Garvin Hicking <[email protected]>
(cherry picked from commit ab92893)
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/88587
TYPO3IncTeam pushed a commit to TYPO3-CMS/fluid that referenced this pull request Mar 13, 2025
The example section was moved into the ViewHelper Reference and
improved with TYPO3-Documentation/TYPO3CMS-Reference-ViewHelper#92

Resolves: #106348
Releases: main, 13.4
Change-Id: I309d38e20e741a42f4da009c4deed13abe7927a3
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/88555
Tested-by: core-ci <[email protected]>
Tested-by: Simon Praetorius <[email protected]>
Reviewed-by: Simon Praetorius <[email protected]>
Tested-by: Georg Ringer <[email protected]>
Reviewed-by: Georg Ringer <[email protected]>
Tested-by: Garvin Hicking <[email protected]>
(cherry picked from commit ab92893d886755e21051e7bf368fa99fd3181302)
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/88587
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