TYPO3-Documentation / TYPO3CMS-Reference-CoreApi

"TYPO3 Explained": Main TYPO3 Core Document: Main classes, Security, TypoScript syntax, Extension API and much more
https://docs.typo3.org/m/typo3/reference-coreapi/master/en-us/
21 stars 370 forks source link

[BUGFIX] Document ModuleConfiguration - source code of Modules.php included #4565

Closed format-gmbh closed 1 week ago

format-gmbh commented 1 week ago

Releases: main, 12.4

github-actions[bot] commented 1 week ago

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr ``` error: could not apply 9a28e6ca... [BUGFIX] Document ModuleConfiguration - source code of Modules.php included hint: After resolving the conflicts, mark them with hint: "git add/rm ", 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 advice.mergeConflict false" ```
stdout ``` Auto-merging Documentation/CodeSnippets/Config/Api/BackendApi.php CONFLICT (content): Merge conflict in Documentation/CodeSnippets/Config/Api/BackendApi.php ```

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-12.4 12.4
# Navigate to the new working tree
cd .worktrees/backport-12.4
# Create a new branch
git switch --create backport-4565-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 9a28e6ca09add83d64bb9932693c4b282910d985,41f730665ea75c611c19747e515edef7f50f1a0c,83ef9cab5c0f958ae7d2784d9eba1b560a8d71b0
# Push it to GitHub
git push --set-upstream origin backport-4565-to-12.4
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-12.4

Then, create a pull request where the base branch is 12.4 and the compare/head branch is backport-4565-to-12.4.