When you synchronize your application with the SAPUI5 repository, conflicts can occur and need to be resolved.
When you submit or retrieve a change, the Conflict column on the Submit Changes or Retrieve Changes screen indicates whether there is a conflict for a file. The dialog shows the files for which submit/retrieve conflicts exist, that is, another user has submitted a newer file version in the meantime. Submit conflicts must be resolved before submission. If retrieve conflicts cannot be solved, the local files are overwritten.
To set the conflict files as resolved, select the file (or multiple files) and choose Set Resolved. The same functionality is also available in the context menu of the selected file or files.
To display the conflicts with the Compare Editor, choose Edit Conflict. The Edit Conflict function is not supported for multiple file selection.
Once you have analyzed and edited the changes, you can choose Save and Set as Resolved for the conflict file.
In the Synchronize view, you can compare the local and remote state.
The Synchronize view also allows you to schedule a periodic refresh of the state of the files in the backend.