Method conflict_next

atomic-core/src/output/traits.rs:511–513

Move to the next side of a conflict. # Arguments `id` - The conflict ID (must match the begin call) `changes` - Optional change hashes for this side

(&mut self, id: usize, changes: Option<&[Hash]>)

    /// * `id` - The conflict ID (must match the begin call)
    /// * `changes` - Optional change hashes for this side
    fn conflict_next(&mut self, id: usize, changes: Option<&[Hash]>) -> Result<(), std::io::Error> {
        self.output_conflict_marker(markers::SEPARATOR, id, changes)
    }

    /// End a conflict region.
    ///