+ Start a Discussion
Admin 3 4Admin 3 4 

Salesforce DX - XML files conflicts

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!!!
SwethaSwetha (Salesforce Developers) 
HI Staurt,
Third-party apps like https://bluecanvas.io/blog/how-to-solve-merge-conflicts-in-salesforce  and https://docs.gearset.com/en/articles/685459-a-guide-to-merging-salesforce-metadata might be of help.
Hope this helps you. Please mark this answer as best so that others facing the same issue will find this information useful. Thank you