When you synchronize your app with a single SAPUI5 repository, you have to resolve potential conflicts.
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 or 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 display the conflicts with the compare editor, choose Edit Conflict. This function is not supported for multiple file selection.
Using the compare editor is not mandatory. You can also edit the file manually to resolve the conflict.
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 check against the back-end state and a corresponding refresh of the display in Eclipse (see the following screenshot).