repo:conflicts:list
List rebase conflicts with each side's changes and values and the resolution choices that work for each, at most 256 per page.
Reference for flywheel repo:conflicts:list.
List the conflicts recorded while a repo:pull rebase is paused. Each conflict shows its kind, the local and remote changes with the IDs, field or relationship they touch and the text values they set, the base value both sides started from when this rebase kept it, the resolution choices for that conflict, and any resolution already chosen. A value is null when a side cleared it, a change marked as a removal takes something away (for example a tombstone or an edge removal), and a value this rebase did not keep is reported as unavailable with its digest instead of being fetched. A choice that repo:conflicts:resolve would refuse now, for example keeping an edge whose endpoint was purged, is marked unavailable with the reason. Human output shortens long values; --format=json returns every value whole. local and remote keep one side's change; manual, offered only for node field conflicts, sets the field to the text of the file passed with --value-file. The list returns at most 256 conflicts at a time; when there are more, pass its next_cursor (printed as the next-page command in human output) to --after for the next page. Its open-conflict count covers the whole rebase. This reads only the local repository: it works offline and publishes nothing. Choose a resolution with repo:conflicts:resolve, then advance the rebase with repo:rebase:continue.
Command Group
Local Repository
Summary
List rebase conflicts with each side's changes and values and the resolution choices that work for each, at most 256 per page.
Usage
flywheel repo:conflicts:list [FLAGS]Required flags
None.
Optional flags
| Flag | Value | Default | Choices | Description |
|---|---|---|---|---|
--repo | string | Local repository filesystem path. | ||
--personal | Use the configured personal repository. | |||
--after | string | Use next_cursor from the previous page of this list. Resolving conflicts keeps it valid; if it is refused because continue changed the conflicts or the rebase ended, list again without --after. | ||
--format | FORMAT | json, tsv, csv, table | Output format for command results. | |
--env | PROFILE | Use a configured CLI profile for this invocation. | ||
--out | PATH | Write output to a file path, or use - for stdout. | ||
--open | Open browser-bound URLs when supported. | |||
--no-retry | Disable transient-error retries. | |||
--retry-max | N | Maximum transient-error retry attempts. | ||
--wait | Block on async operations until a terminal state is reached. | |||
--wait-timeout | SECONDS | 600 | Seconds to wait for --wait before timing out. Defaults to 600. | |
--allow-self | Allow mutating the currently active credential. | |||
--timeout | SECONDS | Set the per-request timeout budget in seconds. | ||
--idempotency-key | KEY | Reuse an Idempotency-Key so ambiguous write failures can be retried with the same key. | ||
--force | Force safety-gated operations where supported. | |||
--yes | Skip confirmation prompts for destructive operations. | |||
--debug | Print structured request debugging with secrets masked. | |||
--verbose | Print verbose progress for long-running operations. | |||
-h, --help | Show this help. |
Examples
List the first page of rebase conflicts.
flywheel repo:conflicts:list --repo <path> --format=jsonList the next page, using next_cursor from the previous one.
flywheel repo:conflicts:list --repo <path> --after <next_cursor> --format=json