From a0466eb3d13ed650a55d7d3dc98219511d1562b1 Mon Sep 17 00:00:00 2001 From: "Philipp A." Date: Thu, 27 Aug 2026 10:06:52 +0200 Subject: [PATCH 1/3] fix: better backport instructions --- meeseeksdev/meeseeksbox/commands.py | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/meeseeksdev/meeseeksbox/commands.py b/meeseeksdev/meeseeksbox/commands.py index 9c06321..863fe33 100644 --- a/meeseeksdev/meeseeksbox/commands.py +++ b/meeseeksdev/meeseeksbox/commands.py @@ -885,33 +885,39 @@ def keen_stats(): There seem to be a conflict, please backport manually. Here are approximate instructions: -1. Checkout backport branch and update it. +1. Update backport branch. ``` -git checkout {target_branch} -git pull +git fetch origin {target_branch}:{target_branch} ``` -2. Cherry pick the first parent branch of the this PR on top of the older branch: +2. Create PR branch. + +``` +git switch -c {remote_submit_branch} {target_branch} +``` + +3. Cherry pick the first parent branch of the this PR on top of the older branch: + ``` git cherry-pick -x -m1 {merge_sha} ``` -3. You will likely have some merge/cherry-pick conflict here, fix them and commit: +4. You will likely have some merge/cherry-pick conflict here, fix them and commit: ``` git commit -am {msg!r} ``` -4. Push to a named branch: +5. Push to a named branch: ``` -git push YOURFORK {target_branch}:{remote_submit_branch} +git push YOURFORK {remote_submit_branch} ``` -5. Create a PR against branch {target_branch}, I would have named this PR: +6. Create a PR against branch {target_branch}, I would have named this PR: -> "Backport PR #{prnumber} on branch {target_branch} ({prtitle})" +> Backport PR #{prnumber} on branch {target_branch} ({prtitle}) And apply the correct labels and milestones. From c3a6fba301eec824b5a15a05198ffd4e75192603 Mon Sep 17 00:00:00 2001 From: "Philipp A." Date: Thu, 27 Aug 2026 10:32:06 +0200 Subject: [PATCH 2/3] cleaner Updated instructions for backporting conflicts in commands.py. --- meeseeksdev/meeseeksbox/commands.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meeseeksdev/meeseeksbox/commands.py b/meeseeksdev/meeseeksbox/commands.py index 863fe33..31ee803 100644 --- a/meeseeksdev/meeseeksbox/commands.py +++ b/meeseeksdev/meeseeksbox/commands.py @@ -884,11 +884,13 @@ def keen_stats(): f"""Owee, I'm MrMeeseeks, Look at me. There seem to be a conflict, please backport manually. Here are approximate instructions: +They assume that the base project is the Git remote `upstream` and your fork is `origin`. 1. Update backport branch. ``` -git fetch origin {target_branch}:{target_branch} +git fetch upstream {target_branch}:{target_branch} +# or `git pull upstream {target_branch}` if you are on {target_branch} ``` 2. Create PR branch. @@ -912,7 +914,7 @@ def keen_stats(): 5. Push to a named branch: ``` -git push YOURFORK {remote_submit_branch} +git push --set-upstream origin {remote_submit_branch} ``` 6. Create a PR against branch {target_branch}, I would have named this PR: From 3c0a755b78ce9b4d59e8e023990b032b29e0850b Mon Sep 17 00:00:00 2001 From: "Philipp A." Date: Thu, 27 Aug 2026 13:47:29 +0200 Subject: [PATCH 3/3] Update meeseeksdev/meeseeksbox/commands.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Michał Krassowski <5832902+krassowski@users.noreply.github.com> --- meeseeksdev/meeseeksbox/commands.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meeseeksdev/meeseeksbox/commands.py b/meeseeksdev/meeseeksbox/commands.py index 31ee803..51450c6 100644 --- a/meeseeksdev/meeseeksbox/commands.py +++ b/meeseeksdev/meeseeksbox/commands.py @@ -899,7 +899,7 @@ def keen_stats(): git switch -c {remote_submit_branch} {target_branch} ``` -3. Cherry pick the first parent branch of the this PR on top of the older branch: +3. Cherry pick the first parent branch of this PR on top of the older branch: ``` git cherry-pick -x -m1 {merge_sha}