Skip to content

Commit

Permalink
Testing
Browse files Browse the repository at this point in the history
  • Loading branch information
iancha1992 committed Mar 29, 2024
1 parent d654032 commit 6bea5fa
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion actions/cherry_picker/functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 6bea5fa

Please sign in to comment.