repo:rebase:continue
Continue one exact rebase: replay every local commit, including ones made while it was open, and keep pending edits that still apply. If later commits change or reopen conflicts, exit 0 with state open means replay is still paused; state continued means replay finished. open_conflict_count counts the conflicts still open; conflict_count counts every recorded conflict, including ones whose earlier choice was kept.
Reference for flywheel repo:rebase:continue.
Advance the paused rebase in the local repository, installing the chosen conflict resolutions. Every local commit is replayed in order, including commits made while the rebase was open. When those later commits touch something the pulled changes also changed, the new or changed conflicts are saved instead, earlier choices for unchanged conflicts are kept, and the result reports state open: resolve them and continue again. If those later commits remove what a saved conflict was about, the command refuses with repository_rebase_conflicts_dropped and changes nothing; abort and pull again. Pending staged edits are kept when they still apply to the rebased history; otherwise the command refuses with repository_rebase_staging_invalid and changes nothing. The result enters local history only and is published only by a separate repo:push. This works offline against the local repository.
Command Group
Local Repository
Summary
Continue one exact rebase: replay every local commit, including ones made while it was open, and keep pending edits that still apply. If later commits change or reopen conflicts, exit 0 with state open means replay is still paused; state continued means replay finished. open_conflict_count counts the conflicts still open; conflict_count counts every recorded conflict, including ones whose earlier choice was kept.
Usage
flywheel repo:rebase:continue [FLAGS] <rebase_id>Arguments
| Argument | Required | Choices | Description |
|---|---|---|---|
<rebase_id> | Yes | Rebase UUID returned by pull or conflict reads. |
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
Continue one exact rebase: replay every local commit, including ones made while it was open, and keep pending edits that still apply. If later commits change or reopen conflicts, exit 0 with state open means replay is still paused; state continued means replay finished. open_conflict_count counts the conflicts still open; conflict_count counts every recorded conflict, including ones whose earlier choice was kept.
flywheel repo:rebase:continue <rebase_id> --format=jsonrepo:rebase:abort
Abort one exact rebase, keeping every local commit and pending edit, including ones made while it was open.
repo:recover-departed
Clone the repository that now holds a departed node and replay the selected source checkout's unpublished commits there. If interrupted, check the source checkout with repo:status: if its departure rebase is still paused, delete the destination checkout and run recovery again, and never reuse or push it; if the rebase is finished, keep the destination checkout, which holds the recovered work.