7A2TSC4PAKK3WOH3DMAJASCEC6D5JLJWNFWJTEEBE4CVS4K76PPQC
KVBLRDOUFRYB6BPOQJDD7OVBYMTTPDAUX7CJ5DC3U7WFRI5OLWRAC
5BRU2RRWOQBMS2V3RQM7PRFR5UILYZ73GISHAKJA6KIZGC5M2MFAC
33ANCTMFGDEI4CDYZCDERYDSWLL2UVXUVAX3GA75RY5VZWYMQSLQC
BZSC7VMYSFRXDHDDAMCDR6X67FN5VWIBOSE76BQLX7OCVOJFUA3AC
WZVCLZKY34KQBQU6YBGJLQCDADBQ67LQVDNRVCMQVY3O3C3EIWSQC
KDF6FJRVF72L274BEUJCTUKRFMNL6BDZMTVKDPEYGFX4TC3YOVSQC
SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC
I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC
}
}
Some(Record::SolveOrderConflict { change: c, local }) => {
// If the last record solved a conflict, replace
// the empty "solving" line with this change.
if change.up_context.len() == 1 && change.up_context[0].change.is_none() {
if let Atom::NewVertex(mut c) = c {
c.down_context.extend(change.down_context.into_iter());
c.start = change.start;
c.end = change.end;
self.rec.actions.push(Record::SolveOrderConflict {
change: Atom::NewVertex(c),
local,
});
return Ok(());
}
} else {
self.rec
.actions
.push(Record::SolveOrderConflict { change: c, local })