Like git. The value isn't necessarily in that there can't be conflicts, but that conflicts are straightforward to surface and resolve.