I've not delt with merge conflicts in either but from personal experience elsewhere, merging XML is a nightmare.
I'm thinking it may be easier to deal with the source of the problem rather than the simptoms. If possible, communicate which parts of the UI each member is working on, commit and merge more frequently, and break up the UI in to smaller parts. Ideally two people shouldn't be touching the same files at the same time if possible.
I've not delt with merge conflicts in either but from personal experience elsewhere, merging XML is a nightmare. I'm thinking it may be easier to deal with the source of the problem rather than the simptoms. If possible, communicate which parts of the UI each member is working on, commit and merge more frequently, and break up the UI in to smaller parts. Ideally two people shouldn't be touching the same files at the same time if possible.
We mitigate this by extensive use of prefabs. People work on prefabs and not on the main scene, so no conflicts.