Begin a conflict region (order conflict). # Arguments `id` - Unique ID for this conflict `changes` - Optional change hashes for the first side
(
&mut self,
id: usize,
changes: Option<&[Hash]>,
)
| 477 | /// * `id` - Unique ID for this conflict |
| 478 | /// * `changes` - Optional change hashes for the first side |
| 479 | fn begin_conflict( |
| 480 | &mut self, |
| 481 | id: usize, |
| 482 | changes: Option<&[Hash]>, |
| 483 | ) -> Result<(), std::io::Error> { |
| 484 | self.output_conflict_marker(markers::START, id, changes) |
| 485 | } |
| 486 | |
| 487 | /// Begin a zombie conflict region. |
| 488 | /// |