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

Move Extension installation in minimal example #265

Closed jonirouAtTalan closed 1 week ago

jonirouAtTalan commented 1 week ago

Second try ;-)

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 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-265-to-13.4 You are currently cherry-picking commit 9517734. (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-265-to-13.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 9517734c1d75701dd5d4a48868c8b2a21bb3ab0c,194b5096a79fa2be1ca711c3f8c994b5cbefb88c,8d70c439dffdbc9bc0db465718961a5d43c3905e,8e7b131422f7bb028b5ec57dc52ebb1315e56eaa,1523f9b7fe391a112bb7727bc2aff31f2e7dafd2,eb2ce7905231e835f790c317fe36110fabaa25f8,3693d85d217925876fa5414f0e461c1257672c19,0e5074da3a380a239c4360efe71062fc92d8b8be,23544e879aa5a57d14b353981a053c3ab9b03430,5e502eb1f8f535858ecb77bd0e911aba6a1ab86b,2135ee2045ff73dd37e5fa3b019d90375e8ad43b,14af6e1c8784f18665fde060085b7a4724836770,ec69bb8617b5a088c032103b0ff90306d588688c,96f6e3487a4f0b14f0b6364bbf28de1a863b71ad,faa51ef83e1b671a882fdc5eeca8dff70541ca18,9ee1637664333b2dabbf6416c1ec85a6928b6336,09e023c91c7b3585b73abf6360fbe60d2d67f53b,9835a90fc6fbb0641e9291ac4c00b7a4e17536d0
# Push it to GitHub
git push --set-upstream origin backport-265-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-265-to-13.4.