Skip to content

Conversation

@linawolf
Copy link
Member

@linawolf linawolf commented Jan 4, 2026

Releases: main, 13.4

Releases: main, 13.4
@linawolf linawolf self-assigned this Jan 4, 2026
@linawolf linawolf merged commit 42bef0c into main Jan 5, 2026
29 checks passed
@linawolf linawolf deleted the bugfix/gravator branch January 5, 2026 07:23
@github-actions
Copy link

github-actions bot commented Jan 5, 2026

The backport to 13.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply fcee3ad... [BUGFIX] Fix gravatar
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 set advice.mergeConflict false"

stdout
Auto-merging Classes/ViewHelpers/GravatarViewHelper.php
CONFLICT (content): Merge conflict in Classes/ViewHelpers/GravatarViewHelper.php
Auto-merging Configuration/Sets/BlogExample/settings.definitions.yaml
Auto-merging Configuration/Sets/BlogExample/setup.typoscript

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

Then, create a pull request where the base branch is 13.4 and the compare/head branch is backport-182-to-13.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.

2 participants