Skip to content

Commit

Permalink
Add check in make stable update (#6618)
Browse files Browse the repository at this point in the history
  • Loading branch information
peb-adr committed Jul 4, 2023
1 parent 7c236cf commit b0628fe
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions dev/scripts/make-update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ merge_stable_branches() {

set_remote
git checkout "$BRANCH_NAME"
check_current_branch

git merge --no-ff "$mod_target_sha" --log --message "Merge main into $STABLE_BRANCH_NAME. Update $(date +%Y%m%d)"
)
Expand Down

0 comments on commit b0628fe

Please sign in to comment.