Transcript
Conflicts are inevitable when deploying on Salesforce and especially within larger teams. So Gearset has made it really easy for users to solve these in a few ways.
Semantic merging will handle many conflicts automatically, removing these from requiring manual intervention.
However, when genuine merge conflicts arise, we won't try and be smart and auto resolve these with guessing. We open this up to the user to specify exactly how these conflicts should be solved.
And, critically, we'll remember how the merge conflict is solved when promoting to higher environments.
So, of course, this approach not only streamlines conflict resolution, but also ensures consistency and reliability throughout the deployment process, saving time and reducing errors or bottlenecks in client projects.
