A collision is detected when the pulled version and the current local version are modifications of a different version, indicating that someone else has modified the same record that you have modified. The team dashboard displays the number of collisions between the local and the parent instance.

About this task

To ensure that your changes do not conflict with other development efforts, you should resolve collisions as soon as they are identified. You must resolve all collisions before you can pull or push.

Procedure

  1. Navigate to All > Team Development > Team Dashboard.
  2. In the control panel, click Collisions or click the count of collisions.
    A list of collisions opens.
  3. Right-click a row and select Resolve Collision.
    Alternatively, open the record and click the Resolve Collision related link.
    The Resolve Collision page displays a comparison between the version that was pulled from the parent and your local record. The page highlights the differences.
  4. Review the differences and perform an action.
    OptionAction
    To maintain the local record as the current version Click Use Local Version. The pulled version is added to the version history for the record.
    To load the version pulled from the parent as the current version Click Use Pulled Version.
    To move a setting from the selected version to update the current version
    Note: Some types of record do not support this method. See Limitations on updating records for more information.
    		 To move a change, click the > (Move Right) button for the field. To work with scripts and text fields, click in the field and modify the text as needed. When the records meet your needs, click Save Merge and Resolve Collision.
    The system performs that action and also clears the collision for future push/pulls.
  5. Repeat the process for every remaining collision.

Result

The system saves the merged changes and resolves the collision.