WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Conversation

@sarahmccarthy123
Copy link
Contributor

No description provided.

@sarahmccarthy123 sarahmccarthy123 added the backport 13.4 Backport to TYPO3v13 label Nov 27, 2025
@linawolf linawolf merged commit 41279ea into main Nov 28, 2025
10 checks passed
@linawolf linawolf deleted the sarah-overhaul-docs9 branch November 28, 2025 11:00
@github-actions
Copy link
Contributor

The backport to 13.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 2bb693a04... [TASK] Overhaul Extension Development Howto Extend TCA
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"

stdout
[backport-6255-to-13.4 d8d8bbe0e] [TASK] Overhaul Extension Development Howto Extend TCA
 Author: Sarah McCarthy <[email protected]>
 Date: Thu Nov 27 18:26:46 2025 +0100
 1 file changed, 10 insertions(+), 11 deletions(-)
Auto-merging Documentation/ApiOverview/Fal/Administration/Storages.rst
CONFLICT (content): Merge conflict in Documentation/ApiOverview/Fal/Administration/Storages.rst
Auto-merging Documentation/ExtensionArchitecture/HowTo/ExtendingTca/StoringChanges/Index.rst
CONFLICT (content): Merge conflict in Documentation/ExtensionArchitecture/HowTo/ExtendingTca/StoringChanges/Index.rst
Auto-merging Documentation/ExtensionArchitecture/Tutorials/Tea/Model.rst
CONFLICT (content): Merge conflict in Documentation/ExtensionArchitecture/Tutorials/Tea/Model.rst

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-6255-to-13.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 921a7bd04c142c84ffc1e0653597a5530c25ee9c,2bb693a0471a1b393b6dcfd965466ab2af4ca7e3,d5a4f84afb61d3d462e53ae5eaf54f45e010682b
# Push it to GitHub
git push --set-upstream origin backport-6255-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-6255-to-13.4.

froemken pushed a commit that referenced this pull request Dec 9, 2025
* [TASK] Overhaul Extension Development Howto Extend TCA

Releases: main, Backport 13.4

* [TASK] Overhaul Extension Development Howto Extend TCA

Releases: main, Backport 13.4
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport 13.4 Backport to TYPO3v13 backport-done

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants