TYPO3CMS-Reference-CoreApi icon indicating copy to clipboard operation
TYPO3CMS-Reference-CoreApi copied to clipboard

[TASK] Add Extbase DebuggerUtility and Fluid Debug ViewHelper. Changed Order of contents

Open Marlineck opened this issue 1 year ago • 2 comments

Marlineck avatar Aug 07 '24 08:08 Marlineck

Thanks for contributing this! I cannot currently review this, since I am mainly on mobile this week. It is sadly hard to review changes when sections are moved AND also changes are made, because then I cannot see what may have changed in a moved section. For that I would need multiple windows/screens.

Tl;dr: can check this next week :)

garvinhicking avatar Aug 08 '24 06:08 garvinhicking

Thanks for your suggestions. Whenever you introduce or change a headline that didnt have one yet, please introduce an anchor: https://docs.typo3.org/m/typo3/docs-how-to-document/main/en-us/Reference/ReStructuredText/Links/Anchors.html

Do you need support in doing so?

I will do some more reviews now and might have additional suggestions

linawolf avatar Aug 08 '24 07:08 linawolf

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply bd055b2d0... [TASK] Add Extbase DebuggerUtility and Fluid Debug ViewHelper. Changed Order of contents
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 advice.mergeConflict false"

stdout
Auto-merging Documentation/ApiOverview/Debugging/Index.rst
CONFLICT (content): Merge conflict in Documentation/ApiOverview/Debugging/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-12.4 12.4
# Navigate to the new working tree
cd .worktrees/backport-12.4
# Create a new branch
git switch --create backport-4654-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick bd055b2d06cd567870ccd76dedc1af1b77971707,e8677ae6b44fd3d932f71bab64b643b21b7de3b3,5f9cd64e751fd6a963a0c49d17c47ddaccec6dc5,0aae94b600da7b8a323e445755d2503fa5fc7bd9,28395edc177554b86925d5312c1110d92fc6da2a,5f6a53672184b52dda7fee8ea7ac9ea3b6dbc99e
# Push it to GitHub
git push --set-upstream origin backport-4654-to-12.4
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-12.4

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

github-actions[bot] avatar Aug 19 '24 16:08 github-actions[bot]

The backport to 11.5 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply bd055b2d0... [TASK] Add Extbase DebuggerUtility and Fluid Debug ViewHelper. Changed Order of contents
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 advice.mergeConflict false"

stdout
Auto-merging Documentation/ApiOverview/Debugging/Index.rst
CONFLICT (content): Merge conflict in Documentation/ApiOverview/Debugging/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-4654-to-11.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick bd055b2d06cd567870ccd76dedc1af1b77971707,e8677ae6b44fd3d932f71bab64b643b21b7de3b3,5f9cd64e751fd6a963a0c49d17c47ddaccec6dc5,0aae94b600da7b8a323e445755d2503fa5fc7bd9,28395edc177554b86925d5312c1110d92fc6da2a,5f6a53672184b52dda7fee8ea7ac9ea3b6dbc99e
# Push it to GitHub
git push --set-upstream origin backport-4654-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-4654-to-11.5.

github-actions[bot] avatar Aug 19 '24 16:08 github-actions[bot]