From 4fe297233730ebcf7f81cf485521577e5df39c8f Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Mon, 22 May 2023 17:20:25 +0200
Subject: [PATCH] fix(onboarding): write gitAuthor before merging into
 onboarding branch (#22353)

---
 lib/util/git/index.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/util/git/index.ts b/lib/util/git/index.ts
index 107c67decd1241..ec518a307f6384 100644
--- a/lib/util/git/index.ts
+++ b/lib/util/git/index.ts
@@ -781,6 +781,7 @@ export async function mergeBranch(
   let status: StatusResult | undefined;
   try {
     await syncGit();
+    await writeGitAuthor();
     await git.reset(ResetMode.HARD);
     await gitRetry(() =>
       git.checkout(['-B', branchName, 'origin/' + branchName])