Skip to main content

execute

lit::commands::resolve

Function execute 

Source 
pub fn execute(
    file: Option<String>,
    strategy: Option<String>,
    all: bool,
    finish: bool,
) -> Result<ResolveResponse, LitError>
Expand description

Resolve merge conflicts programmatically

Modes:

  • lit resolve <file> --strategy=ours — take our version
  • lit resolve <file> --strategy=theirs — take their version
  • lit resolve --all --strategy=ours — resolve all with strategy
  • lit resolve --continue — finalize merge after manual resolution