cli.sgit.ai / Command reference / sgit resolve
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.
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 |
This page as markdown · its source, admin/content/reference/sgit-cli-reference.json