Function resolveAndContinue

app/test/unit/git/rebase/progress-test.ts:187–205

(
  repository: Repository,
  strategy: ManualConflictResolution,
  progressCallback: (progress: IMultiCommitOperationProgress) => void
)

})

async function resolveAndContinue(
  repository: Repository,
  strategy: ManualConflictResolution,
  progressCallback: (progress: IMultiCommitOperationProgress) => void
) {
  const status = await getStatus(repository)
  const files = status?.workingDirectory.files ?? []
  const resolutions = new Map<string, ManualConflictResolution>()

  for (const file of files) {
    if (isConflictedFile(file.status)) {
      resolutions.set(file.path, strategy)
    }
  }

  return continueRebase(repository, files, resolutions, {
    progressCallback,
  })
}