From 77e5a32212e2d517240d4ebd3ce826db5ea88c87 Mon Sep 17 00:00:00 2001 From: Carlos Cordoba Date: Wed, 9 Oct 2024 11:15:48 -0500 Subject: [PATCH] Some small fixes to the Maintenance instructions --- MAINTENANCE.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/MAINTENANCE.md b/MAINTENANCE.md index 0f1ffa6bf03..147a56094a8 100644 --- a/MAINTENANCE.md +++ b/MAINTENANCE.md @@ -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-` - - `git cherry-pick ` + - `git checkout -b backport-pr-` + - `git cherry-pick -m 1 ` - 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-` - - `git cherry-pick ` + - `git checkout -b backport-pr-` + - `git cherry-pick -m 1 ` - `git reset -- external-deps/spyder-kernels` - `git checkout -- external-deps/spyder-kernels` - `git commit` with the files left