{"record":{"id":"a82288e7f6608966","repo":"Kong/insomnia","slug":"merges-with-additions-are-not-supported-yet","errorCode":null,"errorMessage":"Merges with additions are not supported yet.","messagePattern":"Merges with additions are not supported yet\\.","errorType":"exception","errorClass":null,"httpStatus":null,"severity":"error","filePath":"packages/insomnia/src/sync/git/git-vcs.ts","lineNumber":1924,"sourceCode":"    ) {\n      this._baseOpts.fs.startCollectWriteAction(writeFileMap);\n    }\n    return git\n      .merge({\n        ...this._baseOpts,\n        ours: oursBranch,\n        theirs: theirsBranch,\n        abortOnConflict: false,\n      })\n      .catch(async err => {\n        if (err instanceof git.Errors.MergeConflictError) {\n          return await this.collectMergeConflicts(err, oursBranch, theirsBranch, writeFileMap);\n        }\n\n        if (err instanceof git.Errors.MergeNotSupportedError) {\n          const errorMessage = 'Merges with additions are not supported yet.';\n\n          throw new Error(errorMessage);\n        }\n\n        throw err;\n      })\n      .finally(() => {\n        if (\n          'stopCollectWriteAction' in this._baseOpts.fs &&\n          typeof this._baseOpts.fs.stopCollectWriteAction === 'function'\n        ) {\n          this._baseOpts.fs.stopCollectWriteAction();\n        }\n      });\n  }\n\n  async fetch({\n    singleBranch,\n    depth,\n    credentialsId,","sourceCodeStart":1906,"sourceCodeEnd":1942,"githubUrl":"https://github.com/Kong/insomnia/blob/d9bb2b0142600f21309832daea3317942d285984/packages/insomnia/src/sync/git/git-vcs.ts#L1906-L1942","documentation":"Error \"Merges with additions are not supported yet.\" thrown in Kong/insomnia.","triggerScenarios":"Thrown at packages/insomnia/src/sync/git/git-vcs.ts:1924 when the library encounters an invalid state.","commonSituations":"See trigger scenarios.","solutions":[],"exampleFix":null,"handlingStrategy":null,"validationCode":null,"typeGuard":null,"tryCatchPattern":null,"preventionTips":[],"tags":[],"backgroundTag":null,"analyzedSha":"d9bb2b0142600f21309832daea3317942d285984","analyzedAt":"2026-08-26T18:04:05.187Z","schemaVersion":2},"datasetVersion":"2026-08-26T21:11:00.512Z"}