TYPO3-Documentation / t3docs-examples

This extension packages a number of code examples from the Core Documentation.
GNU General Public License v2.0
23 stars 17 forks source link

[BUGFIX] Fix link in Admin Module #273

Closed linawolf closed 4 months ago

linawolf commented 4 months ago

Depends on #271 resolves https://github.com/TYPO3-Documentation/t3docs-examples/issues/110

github-actions[bot] commented 4 months ago

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr ``` error: could not apply c8c1889... [BUGFIX] Fix link in Admin Module 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 Classes/Controller/AdminModuleController.php CONFLICT (content): Merge conflict in Classes/Controller/AdminModuleController.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-273-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick c8c188999600deba9faf6278a1fc99bc9d49ce69
# Push it to GitHub
git push --set-upstream origin backport-273-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-273-to-12.4.