Method pullWithConflictSupport

packages/insomnia/src/sync/git/git-vcs.ts:1266–1346

(credentialsId?: string | null)

  }

  async pullWithConflictSupport(credentialsId?: string | null) {
    const hasUncommittedChanges = await this.hasUncommittedChanges();

    if (hasUncommittedChanges) {
      throw new Error(GitVCSOperationErrors.UncommittedChangesError);
    }

    const writeFileMap = {};

    try {
      if (
        'startCollectWriteAction' in this._baseOpts.fs &&
        typeof this._baseOpts.fs.startCollectWriteAction === 'function'
      ) {
        this._baseOpts.fs.startCollectWriteAction(writeFileMap);
      }
      // Try to pull changes from the remote repository
      await git.pull({
        ...this._baseOpts,
        ...gitCallbacks(credentialsId),
        remote: 'origin',
        singleBranch: true,
      });

      return { success: true };
    } catch (err) {
      if (err instanceof git.Errors.CheckoutConflictError) {
        console.log('[git] CheckoutConflictError detected, resetting working directory and retrying pull');

        try {
          const currentBranch = await this.getCurrentBranch();

          // Reset working directory to HEAD to resolve checkout conflicts
          await git.checkout({
            ...this._baseOpts,
            ref: currentBranch,
            force: true,
          });

          // Retry the pull operation
          await git.pull({
            ...this._baseOpts,
            ...gitCallbacks(credentialsId),
            remote: 'origin',
            singleBranch: true,
            ref: currentBranch,
          });

          console.log('[git] Pull successful after resolving checkout conflicts');
          return { success: true };
        } catch (retryError) {
          console.error('[git] Retry pull failed after resolving checkout conflicts:', retryError);

          const handledError = await this.handleGitPullErrors(err, credentialsId, writeFileMap);

          if (handledError) {
            return handledError;
          }