pub fn mark_resolved(repo_path: &Path, file_path: &str) -> Result<(), String>
Mark the file as resolved (stage it) after manual edits.