TYPO3-Documentation / TYPO3CMS-Tutorial-SitePackage

Tutorial how to create a TYPO3 site package extension from scratch
https://docs.typo3.org/m/typo3/tutorial-sitepackage/master/en-us/
2 stars 49 forks source link

Update EmptyInstallation png #253

Closed jonirouAtTalan closed 1 week ago

jonirouAtTalan commented 1 week ago

Releases : main, 13.4

github-actions[bot] commented 1 week ago

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 <87016425+jonirouAtTalan@users.noreply.github.com> 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.