fix(actions): merge the base branch when resuming an existing dated branch

This commit is contained in:
mateo-berri 2026-07-21 21:48:49 +00:00
parent c785b0ceb1
commit 29cf01e24c
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