Ability to Compare Local Changes to Conflicted Files

In Soft Locks [Conflict Prevention] in Altium 365, we discussed how you deal with file conflicts. We have updated the functionality to offer the possibility to compare the changes between the local version of the conflicted file and the one on the server.

Right-click the conflicting file and choose History & Version Control > Update the Whole Project. After resolving the conflict, the Merge File dialog will open, and you can click the Compare with Latest Commit button. This feature is intended for users to make decisions about adjustments to the project before committing them, saving time and resources.