Skip to content

Conversation

@sarahmccarthy123
Copy link
Contributor

Releases: main, 13.4

@sarahmccarthy123 sarahmccarthy123 changed the title [TASK] Overhaul extension development concepts [TASK] Overhaul extension development file structure Nov 19, 2025
@linawolf linawolf added the backport 13.4 Backport to TYPO3v13 label Nov 26, 2025
@linawolf linawolf merged commit b6270ea into main Nov 26, 2025
10 checks passed
@linawolf linawolf deleted the sarah-overhaul-docs3 branch November 26, 2025 11:52
@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 aa466f5a8... [TASK] Overhaul extension development concepts
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
Auto-merging Documentation/ExtensionArchitecture/FileStructure/Configuration/TCA/Index.rst
CONFLICT (content): Merge conflict in Documentation/ExtensionArchitecture/FileStructure/Configuration/TCA/Index.rst
Auto-merging Documentation/ExtensionArchitecture/FileStructure/Index.rst
CONFLICT (content): Merge conflict in Documentation/ExtensionArchitecture/FileStructure/Index.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-6217-to-13.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick aa466f5a85cfd890fb936c4737b1b94f7c27caeb
# Push it to GitHub
git push --set-upstream origin backport-6217-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-6217-to-13.4.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants