Conflict management and resolution remain one of the most essential aspects of Salesforce DevOps and release management. In fast-moving development environments, teams often face the challenge of merging changes efficiently without errors. With this release, we are excited to introduce a revamped conflict resolution experience —purpose-built to help our customers resolve conflicts faster and more intuitively.
Key Highlights of the New Conflict Management Experience
Revamped Merge Interface
A streamlined user experience that improves usability and reduces friction when resolving conflicts.Performance Improvement
The new merge tool now loads up to 5x faster compared to the previous version.Support For Very Large Metadata Files
Easily manage and merge very large Salesforce metadata components without performance slowdowns.More Intuitive Workflow
The interface has been restructured to require fewer steps to complete merges, helping teams save time and reduce the risk of errors.Enhanced Code Visualization
Built-in syntax highlighting and structured formatting across different metadata types make it easier to spot differences and understand changes at a glance.Inline Editing with Real-Time Change Highlighting
Edit directly within the merge interface, with live updates that instantly highlight modifications as they are made.Auto-Hide of Unchanged Sections
Focus only on what matters. Unchanged portions of the component are automatically collapsed, so users can concentrate on the actual conflicts and differences.Flexible Merge Views
Choose between two-column or three-column merge layouts, depending on personal preference and the complexity of the merge scenario.
Availability
The new conflict management and merge experience is now available to all customers with applicable licenses. No activation steps are required.
Demo
Automatically collapse unchanged sections.
|
Edit inline with real-time change highlighting
|
Switch between two and three columns.
|