From 6bea5fa1199f9535d2d27eff5f5b07aadf848e0e Mon Sep 17 00:00:00 2001 From: iancha1992 Date: Fri, 29 Mar 2024 11:49:05 -0700 Subject: [PATCH] Testing --- actions/cherry_picker/functions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actions/cherry_picker/functions.py b/actions/cherry_picker/functions.py index 4595358744..267f077038 100644 --- a/actions/cherry_picker/functions.py +++ b/actions/cherry_picker/functions.py @@ -152,7 +152,7 @@ def run_cherry_pick(is_prod, commit_id, target_branch_name): update_lockfile(changed_files, True) else: subprocess.run(['git', 'cherry-pick', '--skip']) - unmerged_files_names = "`" + unmerged_all_files.replace("\n", "`\n`") + "`" + unmerged_files_names = ("`" + unmerged_all_files.replace("\n", "`\n`"))[:-1] raise Exception(f"Cherry-pick was attempted but there were merge conflicts in the following file(s). Please resolve manually.\n\n{unmerged_files_names}\ncc: @bazelbuild/triage") elif cherrypick_status.returncode == 0 and ("src/test/tools/bzlmod/MODULE.bazel.lock" in changed_files or "MODULE.bazel.lock" in changed_files): update_lockfile(changed_files, False)