We are using Salesforce DX for continuous integration, integrated with GIT (as VCS), but we are getting a lot of problems when it comes the time to solve XML files conflicts (like profiles, layouts, etc).  For example, when we have two different development sprints, each one with its own GIT branch, we always have problems when it comes the time to merge those two, specially in merging profiles part (and we have 9 profiles)...

Any tip? What tools do you use to solve conflits? We already tried p4merge, kdiff3, etc...

many thanks!!!
Stuart

Is there a way to stop the drop down that give and option to wrap or clip text in a lightning data table?