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] Avoid dynamic properties in ModuleController #224

Merged
merged 1 commit into from
Nov 6, 2023
Merged

Conversation

brotkrueml
Copy link
Contributor

Resolves: #221
Releases: main, 12.4

@brotkrueml brotkrueml merged commit 70a15cd into main Nov 6, 2023
11 checks passed
@brotkrueml brotkrueml deleted the issue-221 branch November 6, 2023 16:52
Copy link

github-actions bot commented Nov 6, 2023

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply a5b4b62... [BUGFIX] Avoid dynamic properties in ModuleController
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".

stdout
Auto-merging CHANGELOG.md
CONFLICT (content): Merge conflict in CHANGELOG.md

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

brotkrueml added a commit that referenced this pull request Nov 6, 2023
brotkrueml added a commit that referenced this pull request Nov 6, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants