{"record":{"id":"cc158d84f9f2734a","repo":"Kong/insomnia","slug":"there-are-uncommitted-changes-on-current-branch-p","errorCode":null,"errorMessage":"There are uncommitted changes on current branch. Please commit them before merging.","messagePattern":"There are uncommitted changes on current branch\\. Please commit them before merging\\.","errorType":"exception","errorClass":null,"httpStatus":null,"severity":"error","filePath":"packages/insomnia/src/sync/git/git-vcs.ts","lineNumber":1897,"sourceCode":"\n    await git.commit({\n      ...this._baseOpts,\n      message: commitMessage,\n      parent: commitParent,\n    });\n  }\n\n  async merge({\n    theirsBranch,\n    allowUncommittedChangesBeforeMerge = false,\n  }: {\n    theirsBranch: string;\n    allowUncommittedChangesBeforeMerge?: boolean;\n  }) {\n    if (!allowUncommittedChangesBeforeMerge) {\n      const hasUncommittedChanges = await this.hasUncommittedChanges();\n      if (hasUncommittedChanges) {\n        throw new Error('There are uncommitted changes on current branch. Please commit them before merging.');\n      }\n    }\n    const oursBranch = await this.getCurrentBranch();\n    console.log(`[git] Merge ${oursBranch} <-- ${theirsBranch}`);\n    const writeFileMap = {};\n    if (\n      'startCollectWriteAction' in this._baseOpts.fs &&\n      typeof this._baseOpts.fs.startCollectWriteAction === 'function'\n    ) {\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      })","sourceCodeStart":1879,"sourceCodeEnd":1915,"githubUrl":"https://github.com/Kong/insomnia/blob/d9bb2b0142600f21309832daea3317942d285984/packages/insomnia/src/sync/git/git-vcs.ts#L1879-L1915","documentation":"Error \"There are uncommitted changes on current branch. Please commit them before merging.\" thrown in Kong/insomnia.","triggerScenarios":"Thrown at packages/insomnia/src/sync/git/git-vcs.ts:1897 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"}