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

Method begin_conflict

atomic-core/src/output/repo/writer.rs:416–424  ·  view source on GitHub ↗
(
        &mut self,
        id: usize,
        changes: Option<&[Hash]>,
    )

Source from the content-addressed store, hash-verified

414 }
415
416 fn begin_conflict(
417 &mut self,
418 id: usize,
419 changes: Option<&[Hash]>,
420 ) -> Result<(), std::io::Error> {
421 let hash = changes.and_then(|c| c.first());
422 self.record_conflict(FileConflictType::Order, id as u32, hash);
423 self.write_marker(markers::START, id as u32, hash)
424 }
425
426 fn begin_zombie_conflict(
427 &mut self,

Calls 2

record_conflictMethod · 0.80
write_markerMethod · 0.80

Tested by 8

test_begin_conflictFunction · 0.36
test_conflict_with_hashFunction · 0.36
test_take_conflictsFunction · 0.36
test_multiple_conflictsFunction · 0.36