MCPcopy Create free account
hub / github.com/atomicdotdev/atomic / end_conflict

Method end_conflict

atomic-core/src/output/traits.rs:520–522  ·  view source on GitHub ↗

End a conflict region. # Arguments `id` - The conflict ID (must match the begin call)

(&mut self, id: usize)

Source from the content-addressed store, hash-verified

518 ///
519 /// * `id` - The conflict ID (must match the begin call)
520 fn end_conflict(&mut self, id: usize) -> Result<(), std::io::Error> {
521 self.output_conflict_marker(markers::END, id, None)
522 }
523
524 /// End a zombie conflict region.
525 fn end_zombie_conflict(&mut self, id: usize) -> Result<(), std::io::Error> {

Callers 3

end_zombie_conflictMethod · 0.45
test_writer_end_conflictFunction · 0.45

Implementers 2

traits.rsatomic-core/src/output/traits.rs
writer.rsatomic-core/src/output/repo/writer.rs

Calls 1

Tested by 2

test_writer_end_conflictFunction · 0.36