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

[TASK] Update dev dependencies #251

Closed brotkrueml closed 5 months ago

brotkrueml commented 5 months ago

The Rector configuration was migrated to the new format.

Releases: main, 12.4

github-actions[bot] commented 5 months ago

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr ``` error: could not apply a7f9b68... [TASK] Update dev dependencies 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". ```
stdout ``` Auto-merging composer.json Auto-merging rector.php CONFLICT (content): Merge conflict in rector.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-251-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick a7f9b68bcee8d39d08b746d75f651e130be30e71
# Push it to GitHub
git push --set-upstream origin backport-251-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-251-to-12.4.