AFAIK, conflict resolution in Subversion is being improved:

* https://subversion.apache.org/docs/release-notes/1.10.html#c...

* https://subversion.apache.org/docs/release-notes/1.11.html#c...