Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BUGFIX] Align requirements for Composer and legacy installs #290

Merged
merged 1 commit into from
Aug 31, 2024

Conversation

linawolf
Copy link
Member

This also prevents TYPO3 Exception 1303237468 #287

Releases: main, 12.4

This also prevents TYPO3 Exception 1303237468 #287

Releases: main, 12.4
@linawolf linawolf self-assigned this Aug 31, 2024
@linawolf linawolf merged commit fa17c59 into main Aug 31, 2024
11 checks passed
@linawolf linawolf deleted the bugfix/ext_emconf branch August 31, 2024 08:09
Copy link

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply caca9ed... [BUGFIX] Align requirements for Composer and legacy installs
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 advice.mergeConflict false"

stdout
Auto-merging ext_emconf.php
CONFLICT (content): Merge conflict in ext_emconf.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-290-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick caca9ede88bc1eed92ef1a55d0a491bbaed211e3
# Push it to GitHub
git push --set-upstream origin backport-290-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-290-to-12.4.

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

Successfully merging this pull request may close these issues.

1 participant