Skip to content

Commit

Permalink
Better commit message in the script
Browse files Browse the repository at this point in the history
  • Loading branch information
lslezak committed Sep 19, 2024
1 parent 0a10271 commit 6d9f0d1
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ def create_branch(client, repo, confirm)
# checkout master, merge the maintenance branch and always use current HEAD
system("git checkout master")
# use ours merge strategy as there will be conflicts we want to ignore
system("git merge -s ours -m \"Clean merge of SP#{SP}\" #{new_branch}")
system("git merge -s ours -m \"Mark the SP#{SP} branch as merged without any change\" #{new_branch}")

# push to master, temporarily disable branch protection
with_unprotected(client, repo.full_name, repo.default_branch) do
Expand Down

0 comments on commit 6d9f0d1

Please sign in to comment.