Skip to main content

conflicting_files

Function conflicting_files 

Source
pub async fn conflicting_files(repo_dir: &Path) -> Vec<String>
Expand description

List files with unresolved merge conflicts (git index state).

Uses git diff --diff-filter=U which checks the index, not file content. A file stays “Unmerged” until git add is run on it, even if conflict markers have been removed from the working tree.