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.

Sign up for GitHub

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

Jump to bottom

PR: Some small fixes to the Maintenance instructions #22654

Merged
merged 1 commit into from
Oct 9, 2024
Merged

PR: Some small fixes to the Maintenance instructions #22654

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions MAINTENANCE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ These are some instructions meant for maintainers of this repo.
* If `meeseeksdev` fails to do the backport, you need to manually open a PR against the stable branch to do it with the following actions:

- `git checkout 6.x`
- `git checkout -b backport-of-pr-<number>`
- `git cherry-pick <commit that was merged to master for that PR>`
- `git checkout -b backport-pr-<number>`
- `git cherry-pick -m 1 <commit that was merged to master for that PR>`
- Solve conflicts

* If a PR that involved updating our spyder-kernels subrepo and needs to be included in the stable branch (e.g. `6.x`), you need to manually create a PR against it with the following actions:

- `git checkout 6.x`
- `git checkout -b backport-of-pr-<number>`
- `git cherry-pick <commit that was merged to master>`
- `git checkout -b backport-pr-<number>`
- `git cherry-pick -m 1 <commit that was merged to master for that PR>`
- `git reset -- external-deps/spyder-kernels`
- `git checkout -- external-deps/spyder-kernels`
- `git commit` with the files left
Expand Down