# sgit resolve, cli.sgit.ai

> Resolve merge conflicts per file or all at once

*Source: <https://cli.sgit.ai/reference/resolve.html> · generated from the same content as the page, so the two cannot drift.*

---
# sgit resolve

Resolve merge conflicts per file or all at once.

*Generated from `sgit help all --format json`, sgit-ai v0.23.0. No subcommands. To change this page, change the command's `register()` in the CLI and regenerate.*

```text
sgit resolve [options] [file]
```

| Argument | | What it is |
|---|---|---|
| `file` | optional | Relative path of the conflicted file |

| Option | What it does |
|---|---|
| `--all` | Resolve all conflicts |
| `--directory` | Vault directory |
| `--ours` | Keep local version |
| `--show` | List unresolved conflicts |
| `--theirs` | Take remote version |

---

*[Site index for agents](../llms.txt) · [HTML version](https://cli.sgit.ai/reference/resolve.html)*