Skip to content

Commit

Permalink
fix(onboarding): write gitAuthor before merging into onboarding branch (
Browse files Browse the repository at this point in the history
  • Loading branch information
rarkins committed May 22, 2023
1 parent 18bd6b6 commit 4fe2972
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions lib/util/git/index.ts
Expand Up @@ -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])
Expand Down

0 comments on commit 4fe2972

Please sign in to comment.