From 765616e3c7cfa16fcf8948b5bb6a3661776742e3 Mon Sep 17 00:00:00 2001 From: Stewart X Addison Date: Wed, 8 Jul 2026 16:19:44 +0100 Subject: [PATCH] tools: reference 'git node land' in PR-URL: error message in merge.sh Signed-off-by: Stewart X Addison --- tools/actions/merge.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/actions/merge.sh b/tools/actions/merge.sh index 45947f64c2a4db..b811c18eb2c5e6 100755 --- a/tools/actions/merge.sh +++ b/tools/actions/merge.sh @@ -48,7 +48,7 @@ fi git log -1 HEAD --pretty='format:%B' | git interpret-trailers --parse --no-divider | \ grep -q -x "^PR-URL: https://github.com/$OWNER/$REPOSITORY/pull/$pr$" || { - echo "Invalid PR-URL trailer" + echo "Invalid PR-URL trailer - have you run 'git node land' to add it?" exit 1 } git log -1 HEAD^ --pretty='format:%B' | git interpret-trailers --parse --no-divider | \