mirror of
https://github.com/BerriAI/litellm.git
synced 2026-09-14 23:21:35 +00:00
fix(actions): merge base branch when resuming dated pricing update branch
This commit is contained in:
parent
c785b0ceb1
commit
bd5f928cab
1 changed files with 1 additions and 0 deletions
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue