Skip to main content

resolve_ours

Function resolve_ours 

Source
pub fn resolve_ours(repo_path: &Path, file_path: &str) -> Result<(), String>
Expand description

Accept the OURS (HEAD) version of a conflicted file. Equivalent to: git checkout –ours && git add