Skip to content

Added index_conflict_remove #1133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 17, 2025
Merged

Added index_conflict_remove #1133

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/index.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,6 +518,15 @@ impl Index {
Ok(())
}

/// Removes the index entries that represent a conflict of a single file.
pub fn conflict_remove(&mut self, path: &Path) -> Result<(), Error> {
let path = path_to_repo_path(path)?;
unsafe {
try_call!(raw::git_index_conflict_remove(self.raw, path));
}
Ok(())
}

/// Remove all matching index entries.
///
/// If you provide a callback function, it will be invoked on each matching
Expand Down