---
title: "skillset resolve"
description: "The Skillset resolve command can repair and stage generated-output conflicts during a rebase or merge."
---

> Documentation Index
> Fetch the complete documentation index at: https://nimbus.focal.host/llms.txt
> Use this file to discover all available pages before exploring further.

# skillset resolve

<!-- Generated by `bun run docs:generate`; do not edit directly. -->

<a id="skillset-resolve"></a>

> Generated from Skillset's CLI presentation contract. See the [documentation system](https://github.com/outfitter-dev/skillset/blob/24800e02ed4e7150ea1bc7130c35603c98ea9da2/docs/development/documentation-system.md).

Repair and stage generated-output conflicts during a rebase or merge.

## Usage

```text
skillset resolve [--yes] [--json] [--root <path>]
```

## Options

| Option | Meaning |
| --- | --- |
| `--json` | Emit exactly one versioned finite JSON result document. |
| `--root <value>` | Select the repository root; defaults to cwd or Git root according to the route. |
| `--yes` | Confirm a fully specified plan-first mutation without prompting. |

## Examples

```text
skillset resolve
skillset resolve --yes
```

Source: https://nimbus.focal.host/skillset/reference/cli/resolve/index.mdx