feat: merge git branch lockfiles unsupported in headless

pnpm · Mar 27, 2022 · 8c0cfb3 · 8c0cfb3
1 parent a4369ef
commit 8c0cfb3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/packages/headless/src/index.ts b/packages/headless/src/index.ts
@@ -137,7 +137,6 @@ export interface HeadlessOptions {
   enableModulesDir?: boolean
   nodeLinker?: 'isolated' | 'hoisted' | 'pnp'
   useGitBranchLockfile?: boolean
-  mergeGitBranchLockfiles?: boolean
 }
 
 export default async (opts: HeadlessOptions) => {
@@ -150,7 +149,8 @@ export default async (opts: HeadlessOptions) => {
   const wantedLockfile = opts.wantedLockfile ?? await readWantedLockfile(lockfileDir, {
     ignoreIncompatible: false,
     useGitBranchLockfile: opts.useGitBranchLockfile,
-    mergeGitBranchLockfiles: opts.mergeGitBranchLockfiles,
+    // mergeGitBranchLockfiles is intentionally not supported in headless
+    mergeGitBranchLockfiles: false,
   })
 
   if (wantedLockfile == null) {