diff --git a/ci/github-script/prepare.ts b/ci/github-script/prepare.ts index be08c09ee525..3425744d4853 100644 --- a/ci/github-script/prepare.ts +++ b/ci/github-script/prepare.ts @@ -57,11 +57,10 @@ export default async ({ if (baseClassification.type.includes('channel')) { const { stable, version } = baseClassification - const correctBranch = stable ? `release-${version}` : 'master' const body = [ 'The `nixos-*` and `nixpkgs-*` branches are pushed to by the channel release script and should not be merged into directly.', '', - `Please target \`${correctBranch}\` instead.`, + `Make sure you know the [right base branch for your changes](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#branch-conventions), then target the correct branch (probably \`release-${stable ? version : '*'}\` or \`master\`) instead.`, ].join('\n') await postReview({ github, context, core, dry, body, reviewKey })