Show TOC

Handling ConflictsLocate this document in the navigation structure

When you synchronize your app with a single SAPUI5 repository, you have to resolve potential conflicts.

Submit or Retrieve Dialogs

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.

SAPUI5 ApplTools SubmitRetrieveConflict

Synchronize View

In the Synchronize view, you can compare the local and remote state.

  1. Mark the SAPUI5 application project in the project explorer in Eclipse.
  2. To open the Synchronize view, choose Start of the navigation path Window Next navigation step Show View Next navigation step Others ... Next navigation step Team Next navigation step Synchronize End of the navigation path.
    1. To connect to a synchronization type, choose Synchronize …, select Synchronize with SAPUI5 Repository as synchronization type, and choose Finish.
    2. To update the Synchronize view, press F5.
  3. The Synchronize view now shows differences between the local and remote state for all shared projects, by indicating whether the project is in sync with the repository or, if not, indicating the differences.

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).

SAPUI5 Synchonization Schedule

Compare Editor
  1. From the Synchronize view, open the compare editor by right-clicking the conflicting file and choosing Open in Compare Editor (or by double-clicking the file).
  2. You can now display and resolve the conflicts in the compare editor (see screenshot below).
  3. Once the conflict is resolved, you can set the status of the file to Resolved by right-clicking the file and choosing Set Resolved. The file is now ready to be submitted.

SAPUI5 ApplTools CompareEditor