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

Add missing "Templates/" in wrong file path #242

Closed butu closed 1 week ago

github-actions[bot] commented 1 week ago

The backport to 13.4 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 ``` Auto-merging Documentation/MinimalExample/Index.rst On branch backport-242-to-13.4 You are currently cherry-picking commit a8166aa. (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-13.4 13.4
# Navigate to the new working tree
cd .worktrees/backport-13.4
# Create a new branch
git switch --create backport-242-to-13.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick a8166aa72b5fe27060c2c7885bc4c4b4b27c32cc
# Push it to GitHub
git push --set-upstream origin backport-242-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-242-to-13.4.

linawolf commented 1 week ago

Preported manually