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 95 forks source link

[TASK] Mention core-upgrader #391

Closed linawolf closed 3 months ago

linawolf commented 3 months ago

Releases: main, 12.4, 11.5

garvinhicking commented 3 months ago

👌🏻

github-actions[bot] commented 3 months ago

The backport to 11.5 failed:

The process '/usr/bin/git' failed with exit code 1
stderr ``` error: could not apply 0012d4a... [TASK] Mention core-upgrader 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". hint: Disable this message with "git config advice.mergeConflict false" ```
stdout ``` Auto-merging Documentation/Major/PostupgradeTasks/Index.rst CONFLICT (content): Merge conflict in Documentation/Major/PostupgradeTasks/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-391-to-11.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 0012d4a3eca1b2527fd0beb6ee1385f05e572024,8e499418bb306745fcb95a2dc4f0450827dc1759,162b531336bb102f85ad4a04af86bacb7c20754d,9a76db145b243d3992feaddf44784563bd232f6c,23a016d25d45bca5ab785ad53d5cbe79b8c96945
# Push it to GitHub
git push --set-upstream origin backport-391-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-391-to-11.5.