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

Clarify which branch "older branch" refers to #97

Open
story645 opened this issue Jan 20, 2023 · 0 comments
Open

Clarify which branch "older branch" refers to #97

story645 opened this issue Jan 20, 2023 · 0 comments

Comments

@story645
Copy link

story645 commented Jan 20, 2023

I made kind of a mess in #25034, partly cause i didn't quite grok which branch older branch is supposed to refer to here
https://github.com/MeeseeksBox/MeeseeksDev/blob/46fe439f28c406e90a7bb863b21ce3020eab3b20/meeseeksdev/meeseeksbox/commands.py#L895
and cherry picked into v3.7.x instead. I'd open the PR myself to fix this but I'm not totally confident which branch this should be, but I'd change this step to something like

  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git checkout {older_branch}
git cherry-pick -x -m1 {merge_sha}
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

No branches or pull requests

1 participant