diff --git a/lib/util/git/index.ts b/lib/util/git/index.ts index a1f8b317fb485e19502519b3cf1b430d668e1ac4..3e7a7c2057fcaa956c48d7c69c2cb2be99ce5f7b 100644 --- a/lib/util/git/index.ts +++ b/lib/util/git/index.ts @@ -621,8 +621,6 @@ export async function isBranchConflicted( branch: string ): Promise<boolean> { logger.debug(`isBranchConflicted(${baseBranch}, ${branch})`); - await syncGit(); - await writeGitAuthor(); const baseBranchSha = getBranchCommit(baseBranch); const branchSha = getBranchCommit(branch); @@ -648,6 +646,8 @@ export async function isBranchConflicted( } let result = false; + await syncGit(); + await writeGitAuthor(); const origBranch = config.currentBranch; try {