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

Fix path to extension icon #127

Closed christian-fries closed 1 year ago

github-actions[bot] commented 1 year ago

The backport to 11.5 failed:

The process '/usr/bin/git' failed with exit code 1
stderr ``` The previous cherry-pick is now empty, possibly due to conflict resolution. If you wish to commit it anyway, use: git commit --allow-empty Otherwise, please use 'git cherry-pick --skip' ```
stdout ``` On branch backport-127-to-11.5 You are currently cherry-picking commit 93fe755. (all conflicts fixed: run "git cherry-pick --continue") (use "git cherry-pick --skip" to skip this patch) (use "git cherry-pick --abort" to cancel the cherry-pick operation) nothing to commit, working tree clean ```

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-127-to-11.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 93fe755e297b96b4ee13f6ed5adf0fb66711bdad
# Push it to GitHub
git push --set-upstream origin backport-127-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-127-to-11.5.

christian-fries commented 1 year ago

No backport needed, it was already fixed for 11.5 in https://github.com/TYPO3-Documentation/TYPO3CMS-Tutorial-SitePackage/commit/605ee930b11b70b0d9c20e7bfd0e22d3af0f6d82.