merge-assist command
Propose resolutions for the conflicts of a merge, rebase or cherry-pick, checked by the compiler. The git state is never changed.
bash
fobis merge-assist [PATHS...] [options]How to use it, with examples: AI assistance.
All options
Arguments: PATHS...
| Option | Value | Default | Description |
|---|---|---|---|
--fobos, -f | TEXT | Specify a "fobos" file named differently from "fobos" | |
--fci | Assume fobos inputs as case insensitive | ||
--mode | TEXT | Select a mode defined into a fobos file | |
--apply | Ask hunk by hunk (accept/ours/theirs/both/edit/skip) and write the accepted resolutions to the working tree. Nothing is ever staged. | ||
--yes | With --apply, no questions: accept the high-confidence deterministic resolutions and the model proposals that compile; leave the others in conflict. | ||
--no-model | Deterministic resolutions only; no model. | ||
--context | Print what the model would receive for each hunk, run no model. | ||
--format | TEXT | text | Output format: text, or json (the report on stdout; asks nothing). |