From 2f8ed18c97af8c4c829bb0cdbdec99ee057a758f Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Wed, 13 Aug 2025 20:46:43 +0200 Subject: [PATCH] ci/github-script/commits: clarify comments Splits the "occasionally" case into two, depending on whether the commit has a diff or was not cherry-picked at all. Prepares the next commit, where these are conditionally shown only. --- ci/github-script/check-cherry-picks.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ci/github-script/check-cherry-picks.md b/ci/github-script/check-cherry-picks.md index 1b214b28eaa7..cda9936d6e30 100644 --- a/ci/github-script/check-cherry-picks.md +++ b/ci/github-script/check-cherry-picks.md @@ -5,6 +5,11 @@ Some of the commits in this PR require the author's and reviewer's attention. Please follow the [backporting guidelines](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#how-to-backport-pull-requests) and cherry-pick with the `-x` flag. This requires changes to the unstable `master` and `staging` branches first, before backporting them. -Occasionally, it is not possible to cherry-pick exactly the same patch. -This most frequently happens when resolving merge conflicts or when updating minor versions of packages which have already advanced to the next major on unstable. +Occasionally, commits are not cherry-picked at all, for example when updating minor versions of packages which have already advanced to the next major on unstable. +These commits can optionally be marked with a `Not-cherry-picked-because: ` footer. + +Sometimes it is not possible to cherry-pick exactly the same patch. +This most frequently happens when resolving merge conflicts. +The range-diff will help to review the resolution of conflicts. + If you need to merge this PR despite the warnings, please [dismiss](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/dismissing-a-pull-request-review) this review shortly before merging.