Kong/insomnia · error · MergeConflictError

Need to solve merge conflicts first

Error message

Need to solve merge conflicts first

What it means

Error "Need to solve merge conflicts first" thrown in Kong/insomnia.

Source

Thrown at packages/insomnia/src/sync/git/git-vcs.ts:1796

            theirsBlobContent,
            suggestedMergeResult,
            mergeResult: suggestedMergeResult,
          });
        }
      }

      // If all conflicts were auto-resolved (no YAML conflicts), complete the merge automatically
      if (mergeConflicts.length === 0 && autoResolvedConflicts.length > 0) {
        await this.continueMerge({
          handledMergeConflicts: [],
          autoResolvedConflicts,
          commitMessage: `Merge branch '${theirsBranch}' into ${oursBranch}`,
          commitParent: [oursHeadCommitOid, theirsHeadCommitOid],
        });
        return { autoResolved: true };
      }

      throw new MergeConflictError('Need to solve merge conflicts first', {
        conflicts: mergeConflicts,
        autoResolvedConflicts,
        labels: {
          ours: `${oursBranch} ${oursHeadCommitOid}`,
          theirs: `${theirsBranch} ${theirsHeadCommitOid}`,
        },
        commitMessage: `Merge branch '${theirsBranch}' into ${oursBranch}`,
        commitParent: [oursHeadCommitOid, theirsHeadCommitOid],
      });
    } else {
      throw new Error('Merge conflict filepaths is of length 0');
    }
  }

  // create a commit after resolving merge conflicts
  async continueMerge({
    handledMergeConflicts,
    autoResolvedConflicts,

View on GitHub (pinned to d9bb2b0142)

When it happens

Trigger: Thrown at packages/insomnia/src/sync/git/git-vcs.ts:1796 when the library encounters an invalid state.

Common situations: See trigger scenarios.

AI-assisted analysis of Kong/insomnia@d9bb2b0142 (2026-08-26). Data as JSON: /api/errors/b6a915cca284cbbf. Report an issue: GitHub.