Skip to main content

Diff and Merge

T3X compares committed structured state rather than only raw text.

Diff​

A structured diff answers questions like:

  • Which fields were added?
  • Which constraints disappeared?
  • Which list items changed order or value?
  • Which branch changed the same path in a conflicting way?

Merge​

A merge combines two structured-state histories. Identical content can be kept automatically. Different or conflicting content should be reviewed before it becomes a new commit.

Review is the point​

T3X is not trying to hide ambiguity. It surfaces state changes and conflicts so a human or agent can decide which reviewed YOps should produce the next durable state.