This command is used to resolve the conflict for the file(s) currently selected in the Files region of the Storage Manager panel. A conflict can arise where the same file has been locally edited and saved by two Altium Designer users, and one has committed those changes. This means that one designer's sequence of steps (check out, edit, save, commit) have interleaved with that of another designer, so a file that a user has checked out from the repository for editing may not remain as latest revision while it is being worked on - another user has updated the revision in the interim. Whomever first commits the edits to the repository in this case will dominate by creating a new revision, while another user that has edited and saved the same file will face a 'Conflict' situation. From a VCS perspective, which compares the working folder files to the repository files, a Conflict represents the condition where an out of date revision of a file in the working folder has been edited and saved.
With at least one conflicting document selected in the Files region of the Storage Manager panel, this command is accessed by right-clicking over the selection and choosing the Resolve Conflict command from the context menu.
First ensure that the file(s) that you wish to resolve conflict for, are selected in the Files region of the Storage Manager panel.
After launching the command, a confirmation dialog will appear, warning you that by resolving the conflict, changes committed to the repository since you last updated will be discarded - click Yes to proceed. The file(s) in your working folder will be updated to the latest revision checked into the repository by the other user, but the editor will retain the changes you have made to the previous revision. The local file therefore acquires a state of Modified, allowing you to commit those changes to a new revision in the repository - either select the file(s) and use the Commit command (on the right-click menu), or simply right-click and choose the Commit Whole Project command.
- Once you have committed the file(s), the other user will see the file(s) as Out of date, since you have created a newer revision in the repository.