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

[TASK] Use constructor DI for viewhelper #139

Merged
merged 1 commit into from
Jul 13, 2024
Merged

[TASK] Use constructor DI for viewhelper #139

merged 1 commit into from
Jul 13, 2024

Conversation

linawolf
Copy link
Member

No description provided.

@linawolf linawolf merged commit 9ae202f into main Jul 13, 2024
26 checks passed
@linawolf linawolf deleted the task/gravator branch July 13, 2024 06:12
Copy link

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 190cb6c... [TASK] Use constructor DI for viewhelper
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 Classes/ViewHelpers/GravatarViewHelper.php
CONFLICT (content): Merge conflict in Classes/ViewHelpers/GravatarViewHelper.php
CONFLICT (modify/delete): Tests/Functional/ViewHelpers/GravatarViewHelperTest.php deleted in HEAD and modified in 190cb6c ([TASK] Use constructor DI for viewhelper).  Version 190cb6c ([TASK] Use constructor DI for viewhelper) of Tests/Functional/ViewHelpers/GravatarViewHelperTest.php left in tree.

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-139-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 190cb6cfe88d297185fa1620e0d854e0165b65bb
# Push it to GitHub
git push --set-upstream origin backport-139-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-139-to-12.4.

@linawolf
Copy link
Member Author

No backport needed

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

Successfully merging this pull request may close these issues.

1 participant