Customizing Conflict Resolution for Collection Properties

ATG Merchandising assists users with resolving version conflicts between projects by suggesting combined changes for values of collection properties (lists, maps, sets, and arrays). The following options of this feature are configurable:

Setting the Maximum Number of Collection Items to Combine

Setting the Display Maximum for Collection Properties during Conflict Resolution

Setting the Precedence of Removed Items in Suggested Collection Values

For information about using the conflict resolution feature, see Resolving Conflicts with Other Projects.

Setting the Maximum Number of Collection Items to Combine

Out-of-the-box, ATG Merchandising displays only the first 2300 items in a collection when you resolve conflicts on the Review Changes page. As a result, if either version of the collection has more than 2300 items, then ATG Merchandising does not suggest a combined value because it cannot be fully displayed.

You can override this setting by changing the maximum number to a different value, or by removing the limit and always combining collection versions regardless of the number of items in the collection.

In both cases, only the first 2300 items are displayed unless you change the display limit. See Setting the Display Maximum for Collection Properties during Conflict Resolution.

To change or remove the item limit when combining collections:

  1. Override the atg/diff/merge/MergeHandlerFactory component in your local configuration directory (for example, <ATG9dir>/home/localconfig).

  2. Locate the maxSizeLimit property and set the value as follows:

    • To change the limit, set the value to the maximum number of items to allow ATG Merchandising to suggest a combination for.

      If any of the collection values exceeds this number, then the collection values will not be combined and a suggestion is not displayed.

    • To remove the limit, set the value to -1.

      All items in the collection will be combined to create a suggested value regardless of whether the full collection is displayed.

For instructions for setting component properties, see the ATG Programming Guide.

Setting the Display Maximum for Collection Properties during Conflict Resolution

To avoid potential problems that could occur when displaying very large collections, ATG Merchandising displays only the first 2300 items in a collection by default when you resolve conflicts on the Review Changes page. You can set this limit to another value by changing the maxNumDisplayedValues attribute on the propertyView for collections that have conflicts.

Note: Increasing this limit above 2300 could cause issues with displaying collections in some browsers.

To edit the maximum number of collection items that can be displayed during conflict resolution:

  1. Create a new propertyViewAttributeDefinition to hold the new value you want to set as the maximum number of items to display in a collection during conflict resolution.

    Provide a meaningful name that is easy to locate, a unique ID, and a description, and then set the attribute value to the new display limit that you want to use.

  2. Locate the following propertyView items and add the propertyViewAttributeDefinition that you just created to their attributes. For each propertyView, add a new entry in the attributes list named maxNumDisplayedValues and map it to the ID of the propertyViewAttributeDefinition from step 1.

    For this collection type

    Locate and edit this propertyView

    Arrays

    Name: AssetManager array conflict viewer
    ID: aMgrPvCArray

    Lists

    Name:  AssetManager list conflict viewer
    ID: aMgrPvCList

    Sets

    Name: AssetManager set conflict viewer
    ID: aMgrPvCSet

  3. Log in to ATG Merchandising and verify that Review Changes page displays the expected number of items when you resolve conflicts between very large collections.

Tip: If you use the ATG Control Center to edit this attribute, you may have to restart the ATG Merchandising server for your changes to take affect.

For more information about editing view mappings, see the Customizing Asset Display chapter of the ATG Content Administration Programming Guide.

Setting the Precedence of Removed Items in Suggested Collection Values

When resolving conflicts between list, array, or map properties, if one project edits or reorders an item and the other project removes the same item, the item is removed in the combined collection suggested by ATG Merchandising. You can configure this setting so that changes or reorders are kept and the remove action is ignored, for example, if the value of a map item is changed in one project and the map item is deleted in another project, the changed item is kept in the combined changes.

To configure whether items are always removed when one project removes and another project edits the same item:

  1. Override the atg/diff/merge/MergeHandlerFactory component in your local configuration directory (for example, <ATG9dir>/home/localconfig).

  2. Locate the removesWin property and set the value as follows:

For instructions about setting component properties, see the ATG Programming Guide.

 
loading table of contents...