Skip to content

Conversation

@jonirouAtTalan
Copy link
Contributor

Releases : main, 13.4

Update version and project name
Update TYPO3 version (not -dev)
And foolowing tutorial, recycler extension is installed
@linawolf linawolf self-assigned this Nov 18, 2024
@linawolf linawolf merged commit 20e6c93 into TYPO3-Documentation:main Nov 18, 2024
2 checks passed
@github-actions
Copy link
Contributor

The backport to 13.4 failed:

The process '/usr/bin/git' failed with exit code 128
stderr
error: commit 194b5096a79fa2be1ca711c3f8c994b5cbefb88c is a merge but no -m option was given.
fatal: cherry-pick failed

stdout
[backport-253-to-13.4 2d87c7a] Update EmptyInstallation.png
 Author: jonirouAtTalan <[email protected]>
 Date: Mon Nov 18 18:20:50 2024 +0100
 1 file changed, 0 insertions(+), 0 deletions(-)

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-253-to-13.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 9517734c1d75701dd5d4a48868c8b2a21bb3ab0c,194b5096a79fa2be1ca711c3f8c994b5cbefb88c,8d70c439dffdbc9bc0db465718961a5d43c3905e
# Push it to GitHub
git push --set-upstream origin backport-253-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-253-to-13.4.

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