CLI reference
heddle resolve
Shippedheddle resolve [OPTIONS] [PATH] Resolve merge conflicts
Output text (default) · json
Arguments
[PATH]value optional- File to resolve
Flags
--all <ALL>- Resolve all conflicts values:
true · false --list <LIST>- List unresolved conflicts values:
true · false --ours <OURS>- Use our version (current thread) values:
true · false --theirs <THEIRS>- Use their version (merged thread) values:
true · false --force <FORCE>- Mark the path resolved even if conflict markers are still present values:
true · false --op-id <OP_ID>hidden- Operation id (UUID v4) for idempotent retries. See `heddle help operation-ids` Accepted by the CLI, but absent from standard
--help.