From b6f03da8559bd45b437e460dd3c9ecd1b2314881 Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Fri, 7 Feb 2025 17:15:23 +0100 Subject: [PATCH] Avoid conflict in branch names used when vendor package PRs (#1259) Signed-off-by: Addisu Z. Taddese --- release.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.py b/release.py index a65280db5..c58947982 100755 --- a/release.py +++ b/release.py @@ -747,7 +747,7 @@ def create_pr_for_vendor_package(args, repo_path, base_branch) -> str: if not _out.decode(): return 'vendor tool did not produce any change, avoid the PR' - branch_name = f'releasepy/{args.version}' + branch_name = f'releasepy/{base_branch}/{args.version}' vendor_repo = get_vendor_repo_url(args.package) branch_cmd = ['git', "-C", repo_path, 'checkout', '-b', branch_name]