Skip to main content

rebase_continue

Function rebase_continue 

Source
pub async fn rebase_continue(
    repo_dir: &Path,
    conflicting: &[String],
) -> Result<Option<Vec<String>>>
Expand description

Stage resolved conflict files and continue the in-progress rebase.

Returns Ok(None) if the rebase completed successfully after continuing. Returns Ok(Some(files)) if continuing hit new conflicts on the next commit. Returns Err on unexpected failures.

Because the parent start_rebase uses --empty=drop, any commits that become empty after conflict resolution are automatically dropped by git during --continue.