Just a stream of thoughts: if git commits were a list of sequential primitive changes instead of diff snapshots, conflict resolution would be trivial in most cases.

Not without cons of course: commit byte size, public WIP work and leaked secrets/unwanted edits.