[exikyut]

Oh no. Now you need full file format parsing so that you can resolve merge conflicts.

:(

That would take years to get anywhere with ._.

The diffing idea I suggested above is just manageable, a la macOS Preview, with hacks. Branching requires folding-back-in, and that's not just a case of "A or B", it's a case of "A, B and C conflict with D and E, while F G and H are okay," where I could then say "save B and E but drop F". If B is a layer, E is an imported asset and F is a custom filter... you get the picture. You need a reimplementation of Photoshop (halting problem).

:/

Sad that everyone hates GIMP.

But... hmm, this could get folded into Blender, and then make the rest of the industry jealous.......