Merging Changes Dependent on One Another

Changes from Application Update	Changes from Customer	Result of the Merge on the Pivot Grid Object
Updates from application development on the pivot grid model and related objects. For example, removing a dimension.	Customer makes no change to the Pivot Grid model, but customer is using the dimension (that was removed by Application developer) in one of the Pivot Grid related actions.	No merge is performed because of the customization. However, during validation, the conflict is detected and flagged as an error in the validation report, and customer has to modify the related action.

Changes from Application Update

Changes from Customer

Result of the Merge on the Pivot Grid Object

Updates from application development on the pivot grid model and related objects.

For example, removing a dimension.

Customer makes no change to the Pivot Grid model, but customer is using the dimension (that was removed by Application developer) in one of the Pivot Grid related actions.

No merge is performed because of the customization. However, during validation, the conflict is detected and flagged as an error in the validation report, and customer has to modify the related action.