Right now, we perform merge conflicts on JSON blobs pulled directly out of the snapshot we're merging from. This has a whole host of limitations associated with it, including:
We should instead make merge conflicts occur on core objects (falling back to JSON when necessary) so that our merge conflicts can be improved.
Right now, we perform merge conflicts on JSON blobs pulled directly out of the snapshot we're merging from. This has a whole host of limitations associated with it, including:
type_lib_mapping#5723We should instead make merge conflicts occur on core objects (falling back to JSON when necessary) so that our merge conflicts can be improved.