This commit is contained in:
Taliesin Sisson 2023-04-04 20:50:24 +01:00 committed by GitHub
parent 89fb1fe67a
commit f34b433b22
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -190,7 +190,7 @@ export async function createOrUpdateBranch(
core.info( core.info(
`Rebasing commits made to ${workingBaseType} '${workingBase}' on to base branch '${base}'` `Rebasing commits made to ${workingBaseType} '${workingBase}' on to base branch '${base}'`
) )
const compareBranches = `${base}..${tempBranch}` const compareBranches = `main..${tempBranch}`
// Checkout the actual base // Checkout the actual base
await git.fetch([`${base}:${base}`], baseRemote, ['--force']) await git.fetch([`${base}:${base}`], baseRemote, ['--force'])
await git.checkout(base) await git.checkout(base)