fix(actions): merge base branch when resuming dated pricing update branch

This commit is contained in:
Cursor Agent 2026-07-14 23:29:49 +00:00
parent c785b0ceb1
commit bd5f928cab
No known key found for this signature in database

View file

@ -33,6 +33,7 @@ jobs:
git fetch origin "${BASE_BRANCH}" "${BRANCH_NAME}" || true
if git show-ref --verify --quiet "refs/remotes/origin/${BRANCH_NAME}"; then
git checkout -B "${BRANCH_NAME}" "origin/${BRANCH_NAME}"
git merge --no-edit "origin/${BASE_BRANCH}"
else
git checkout -b "${BRANCH_NAME}" "origin/${BASE_BRANCH}"
fi