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 assignMultiple() where appropriate #85

Merged
merged 1 commit into from
Apr 2, 2024

Conversation

brotkrueml
Copy link
Contributor

Releases: main, 12.4

Copy link
Member

@linawolf linawolf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the advantage in doing this? Isn't chaining just as valid? Is this an official recommendation?

Copy link

@garvinhicking garvinhicking left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(Lina: It's less op-calls to perform, and IMO has less redundancy and is clearer to read)

@brotkrueml
Copy link
Contributor Author

Yup, my intention was better readability.

@brotkrueml brotkrueml merged commit 4f1c956 into main Apr 2, 2024
7 checks passed
@brotkrueml brotkrueml deleted the use-view-assign-multiple branch April 2, 2024 11:37
Copy link

github-actions bot commented Apr 2, 2024

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 7f74d5f... [TASK] Use assignMultiple() where appropriate
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 Classes/Controller/BlogController.php
CONFLICT (content): Merge conflict in Classes/Controller/BlogController.php
Auto-merging Classes/Controller/PostController.php
CONFLICT (content): Merge conflict in Classes/Controller/PostController.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-85-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 7f74d5f175d0cd6c262e2f00bc7fac2a89bc8572
# Push it to GitHub
git push --set-upstream origin backport-85-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-85-to-12.4.

brotkrueml added a commit that referenced this pull request Apr 2, 2024
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