chore: refactor variable names for isomorphic git.

2020-12-29 13:32:24 +01:00
parent 610b3a205a
commit 8bccc6bec0
4 changed files with 33 additions and 32 deletions
@@ -170,8 +170,8 @@ export const checkoutGitRepository = async (
      await git.fetch({ dir: repositoryTmpPath, remote: 'origin' });
      await git.merge({
        dir: repositoryTmpPath,
-        headBranch: `origin/${currentBranchName}`,
-        baseBranch: currentBranchName || undefined,
+        theirs: `origin/${currentBranchName}`,
+        ours: currentBranchName || undefined,
        author: { name: 'Backstage TechDocs', email: 'techdocs@backstage.io' },
        committer: {
          name: 'Backstage TechDocs',