TYPO3-Documentation / TYPO3CMS-Guide-Installation

TYPO3 Installation & Upgrade Guide, Migrate to Composer, etc.
https://docs.typo3.org/m/typo3/guide-installation/master/en-us/
4 stars 96 forks source link

[TASK] Migrate to the new PHP-based rendering #383

Closed linawolf closed 1 month ago

linawolf commented 1 month ago

Releases: main, 12.4, 11.5

github-actions[bot] commented 1 month ago

The backport to 11.5 failed:

The process '/usr/bin/git' failed with exit code 1
stderr ``` error: could not apply ec30ac3... [TASK] Migrate to the new PHP-based 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 ``` Auto-merging Documentation/Major/Index.rst CONFLICT (content): Merge conflict in Documentation/Major/Index.rst Auto-merging Documentation/Major/PreupgradeTasks/Backup.rst.txt CONFLICT (content): Merge conflict in Documentation/Major/PreupgradeTasks/Backup.rst.txt Auto-merging Documentation/Major/PreupgradeTasks/Index.rst Auto-merging Documentation/MigrateContent/Index.rst CONFLICT (modify/delete): Documentation/Settings.cfg deleted in ec30ac3 ([TASK] Migrate to the new PHP-based rendering) and modified in HEAD. Version HEAD of Documentation/Settings.cfg 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-383-to-11.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick ec30ac37f6cd43600fb148c6f5bf95eb2e068955
# Push it to GitHub
git push --set-upstream origin backport-383-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-383-to-11.5.

github-actions[bot] commented 1 month ago

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr ``` error: could not apply ec30ac3... [TASK] Migrate to the new PHP-based 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 ``` Auto-merging Documentation/Major/PreupgradeTasks/Index.rst CONFLICT (modify/delete): Documentation/Settings.cfg deleted in ec30ac3 ([TASK] Migrate to the new PHP-based rendering) and modified in HEAD. Version HEAD of Documentation/Settings.cfg 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-12.4 12.4
# Navigate to the new working tree
cd .worktrees/backport-12.4
# Create a new branch
git switch --create backport-383-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick ec30ac37f6cd43600fb148c6f5bf95eb2e068955
# Push it to GitHub
git push --set-upstream origin backport-383-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-383-to-12.4.