tree_value_to_conflict()
It seems that this function didn't serve the purpose I intended it to; we only passed in `TreeValue::Conflict` variants to it.
ConflictId
update_conflict_from_content()
@git
jj
br
refs/heads/br
ui.diff-instructions
JJ-INSTRUCTIONS
backend::Conflict
jj git push