We are excited to announce the launch of Salto has now a deployment-built-in conflict resolution flow. With this new capability, teams working with multiple sandboxes and collaborating on configuration changes can now easily detect and resolve conflicts, preventing configuration overwrites and ensuring smooth deployments

‍

‍

Simplifying Conflict Resolution Process

When multiple developers or admins work on the same configuration elements, conflicts can arise, leading to overwritten changes and potential issues. Salto's new conflict resolution flow, simplifies the process of detecting and resolving conflicts, saving time, reducing errors, and enhancing collaboration.

‍

Intuitive Point-and-Click UI

Salto's intuitive point-and-click conflict resolution flow eliminates the need for complex XML / code-like representation knowledge, making it accessible to both admins and developers. The visual representation of conflicts and the friendly resolution flow empower teams to understand and resolve conflicts effortlessly.

How it works?

Our intuitive conflict resolution flow, is now an integral part of the deployment process. Once a deployment is initiated, Salto will automatically scan for any conflicts that might arise.

‍

‍

In-Depth Conflict Exploration

Each conflict is not just flagged; it's presented in a way that empowers users to choose the right resolution. You'll have a clear view of:

• The existing values in the target environment.
• The proposed changes awaiting deployment.
• The option to choose which version you prefer to retain.
  ‍

‍

Tailored Editing for Precision Control

But we don't stop at just showing you the conflicts. In instances where you need a more hands-on approach, you can manually edit the configuration element. This is especially useful when the element in question involves text-based content like Apex, SuiteScripts, or Groovy scripts.

‍

Advanced 3-Way Diff Editor

For a comprehensive view, our 3-way diff editor allows you to see both versions of the text and make edits directly in the file, ensuring that you have all the control you need to make the best decision.

‍

‍

Key Benefits of Salto's Merge Conflict Resolution

• Prevent Configuration Overwrites: Ensure team members don't accidentally overwrite each other's configuration changes.
• Point-and-Click Ease: Visual representation of conflicts and a user-friendly resolution flow, eliminating the need for XML expertise.
• Save Errors and Time: Reduce errors that can arise from conflicting changes and the time required to resolve them.
• Better Collaboration: Gain visibility into changes your team members are working on.

‍

How Salto Handles Merge Conflicts

Salto's intelligent capabilities include semantic merge and automatic conflict detection.

Semantic merge - Salto’s semantic merge stands out due to its unique approach to configuration management. By understanding the semantics of configurations, Salto logically organizes them, breaking down configuration elements into their most detailed attributes. This detailed breakdown is what enables users to deploy specific, smaller chunks of their configuration elements. This capability is crucial in preventing the potential conflicts that may arise with a bulk merge of large elements along with all their components. It’s the ability to manage and deploy these smaller segments separately that adds significant value to the process.

Automatic conflict detection - When a deployment is initiated, Salto automatically detects merge conflicts and guides users through a point-and-click resolution flow, simplifying the conflict resolution process.

‍

Prepare for a Smoother Deployment Experience

Anticipate your next deployment with confidence! With Salto's new intuitive conflict resolution flow, you're equipped to handle any conflicts that may arise.

Haven't Tried Our Deployment Experience Yet?

There's no better time to start than now. Experience a deployment process that's not just efficient but also intuitive.

🗣️ Talk to Our Team – We're here to guide you through the unique benefits and features of Salto. Let us help you make your deployment process seamless and conflict-free.

For those who want to delve deeper or need more detailed guidance, we've prepared this Help Article