Resolving Collisions (SAP Library - Mobile Application Studio)

Resolving Collisions

Use

You use this procedure to resolve collisions that occurred between two versions of a development object. You must resolve the collisions to continue working with that development object. For more information about collisions, see Collision.

Prerequisites

You have identified the:

· Reasons for which collisions have occurred. For more information, see Difference Viewer.

· Type of collision that has occurred by viewing the differences between the colliding object versions (between which the collision has occurred). For more information, see Viewing Differences Between Colliding Versions.

· Option you need to choose to resolving the collision.

Note

The table below indicates the various types of collisions that may occur and the appropriate option to be executed to resolve the collision.

Collision Type ® Option ¯	Predecessor Successor Collision	Translation Collision	Imported Deleted Notification Collision	Ownership Transfer Collision
Accept Baseline Version	P	P	NP	NP
Accept Change List Version	P	P	NP	P
Merge	P	NP	NP	P

P - Possible

NP - Not Possible

Procedure

To access the options to resolve a collision, open the Collision Explorer window by choosing View ® Collision Explorer.

Option	Result	Comments
Accept Baseline Version	The baseline version is accepted and the changes made in the change list version are discarded.	This is possible when the repository owns the discarded version (change list version).
Accept Change List Version	The change list version is accepted. Baseline version is discarded.
Merge	Allows you to accept required changes made to the baseline version as well as the change list version. If you are merging a collision that occurred in the persistence layer, you must select a change list for the merge. This can be the current change list, another existing change list or you can create a new change list. Select the changes you want to retain and save the selection.	The Merge option provides you with a Merge Designer containing both versions of the object as well as a merged version of the object in a grid format. Use the Merged section to make the changes that you want and save your work.
Merge ® View Code	Allows you to accept required changes made to the baseline version as well as the change list version. If you want to view code differences and make changes there to resolve a collision, click the secondary mouse button in the Merge Designer and choose View Code.	The Merge Code Designer containing both versions of the object code as well as a merged version of the object code. You can make the changes and save your work.