Merge tool
-
- UpdatedJan 30, 2025
- 2 minutes to read
- Yokohama
- Building applications
The Diff Merge tool enables administrative users to compare differences between two versions of a record.
Administrators can compare field-level changes between two versions, apply changes using Move Right field-level copy functionality and then merge results, or choose to revert to the non-current version. You can access the Diff Merge tool by comparing versions, resolving conflicts, or resolving collisions, during development or after upgrades.
Accessibility Functions
The platform includes accessibility features that support Web Content Accessibility Guidelines (WCAG) 2.0 level A and make the interface accessible to users with disabilities. These features improve the user experience when accessing platform functions with Using accessibility features.
- Press Tab to navigate major groupings in a pre-defined sequence, including moving between standard interface controls (fields and lists) in a module, or between records within a tab.
- Press Shift Tab to move backwards in a pre-defined sequence.
Visually impaired users can navigate the Diff Merge tool. Screen readers can read all critical page content. All links and buttons can be reached when a section that is critical must be read. VoiceOver audible cues describe the content of the section that is necessary to read.
To enable accessibility functions, administrators should set these sys_properties:
- Setting glide.ui.javascript_editor to false makes the following
functions accessible:
- Script fields (such as Script Include).
- Side-by-side script comparison.
- Setting sys_properties color settings enables high contrast visibility, which makes the left
and right columns more accessible and easier to read by visually impaired users.
- mergetool.bg.left.highlight - Left column cell color when values differ between versions.
- mergetool.bg.right.highlight - Right column cell color when values differ between versions.
- mergetool.bg.left - Left column cell color when version values are the same.
- mergetool.bg.right - Right column cell color when version values are the same.
On this page
Related Content
- Compare to the current version
You can compare a version to the current version for any customizable object that a user has modified, such as a form layout or business rule. You can also compare the local and current pulled version of an object in Team Development. Administrators can suppress versions for specific tables.
- Compare a pushed version to a local version
Code reviewers can compare the pushed versions to the local versions to see the potential effect of incoming changes.
- Compare two versions of an article
- Resolve conflicts for an individual record
- Resolve a collision in Team Development
A collision is detected when the pulled version and the current local version are modifications of a different version, indicating that someone else has modified the same record that you have modified. The team dashboard displays the number of collisions between the local and the parent instance.
- Revert a change
You can undo changes to a customized record by reverting to an older version.
- View customizations and compare with current version
View the customizations that make up an update set and compare the update to the current version.