CLI reference
heddle resolve
Shippedheddle resolve [OPTIONS] [PATH] Resolve merge conflicts. Pairs with the top-level heddle continue and heddle abort, which act on whatever operation is in flight without you having to remember which one it was.
Output text (default) · json
When land or sync fails closed on a conflict, resolve is the recovery surface. --list enumerates what is unresolved; --ours and --theirs take one side; --all resolves everything; --force marks a path resolved even if conflict markers are still present.
Two commands finish the job, and neither needs you to name the operation: heddle continue continues the active operation without remembering the specific subcommand, and heddle abort aborts it on the same terms. That phrasing is the design — an agent does not have to track what is in flight. heddle resolve --abort aborts the merge specifically.
Arguments
[PATH]path optional- File to resolve.
Flags
--list- List unresolved conflicts.
--all- Resolve all conflicts.
--ours- Use our version (current thread).
--theirs- Use their version (merged thread).
--force- Mark the path resolved even if conflict markers are still present.
--abort- Abort the merge.
Examples
Work a conflicted land back to clean
bash$ heddle resolve --list$ heddle resolve src/auth/mod.rs$ heddle continue# or: heddle abort — neither needs the operation named