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] Do not reuse DataHandler #275

Merged
merged 1 commit into from
May 24, 2024
Merged

[BUGFIX] Do not reuse DataHandler #275

merged 1 commit into from
May 24, 2024

Conversation

linawolf
Copy link
Member

@linawolf linawolf force-pushed the task/datahandler branch from aed0dd2 to 77bad98 Compare May 23, 2024 18:21
@linawolf linawolf self-assigned this May 23, 2024
@linawolf linawolf force-pushed the task/datahandler branch from 77bad98 to 389ba82 Compare May 23, 2024 18:23
@linawolf linawolf merged commit 8c94561 into main May 24, 2024
10 checks passed
@linawolf linawolf deleted the task/datahandler branch May 24, 2024 04:40
Copy link

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 389ba82... [BUGFIX] Do not reuse DataHandler
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/Controller/AdminModuleController.php
CONFLICT (content): Merge conflict in Classes/Controller/AdminModuleController.php
Auto-merging Classes/Controller/ModuleController.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-275-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 389ba8271978eb877fea64fb12057441994e746a
# Push it to GitHub
git push --set-upstream origin backport-275-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-275-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.

3 participants