Appearance
tes conflicts
List unresolved merge conflicts in the repository.
Usage
bash
tes conflicts [options]Options
--json- Emit structured JSON output withbase,ours, andtheirscode snippets and participating session IDs.
Description
tes conflicts lists all files that currently have an unresolved structural merge conflict.
Examples
bash
# list unresolved conflicts
tes conflicts
# inspect full conflict snippets as JSON
tes conflicts --json