repo:conflicts:show
Show one rebase conflict: each side's changes and values, the base value when kept, and its usable choices.
Reference for flywheel repo:conflicts:show.
Show one conflict from a paused rebase in the local repository, in the same form as repo:conflicts:list: its local and remote changes with their values, the base value when this rebase kept it, its usable resolution choices, and any chosen resolution. Use --format=json for complete values; human output shortens long ones. This is a local, read-only inspection: it changes nothing, works offline, and publishes nothing.
Command Group
Local Repository
Summary
Show one rebase conflict: each side's changes and values, the base value when kept, and its usable choices.
Usage
flywheel repo:conflicts:show [FLAGS] <conflict_id>Arguments
| Argument | Required | Choices | Description |
|---|---|---|---|
<conflict_id> | Yes | Conflict UUID. |
Required flags
None.
Optional flags
| Flag | Value | Default | Choices | Description |
|---|---|---|---|---|
--repo | string | Local repository filesystem path. | ||
--personal | Use the configured personal repository. | |||
--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
Show one rebase conflict: each side's changes and values, the base value when kept, and its usable choices.
flywheel repo:conflicts:show <conflict_id> --format=json