you don't need a trustless way - the two mutually non cooperating parties could fork the repo, reconcile separately using traditional git tools and then have the new commit(s), representing the conflict, merged into the main branch.
this is literally already what happens with software development now.
this is literally already what happens with software development now.