Conflict types for the click-to-merge enhancement
When you use the click-to-merge enhancement introduced in WebSphere Commerce Version 7 Feature Pack 5 or higher, some deltas might not be migrated automatically. The deltas that cannot be migrated are categorized as a different conflict type, depending on the change type each is associated with and the reason the conflict occurred. For every conflict type, the delta cannot be migrated because a customization you made to WebSphere Commerce Version 7 Feature Pack x conflicts with a change that is in WebSphere Commerce Version 7 Feature Pack y base.
The following table lists the change types and the conflict types that might occur for each change type.
Change Type | Conflict Type |
---|---|
Modify Attribute | You modified the value of an attribute in Feature
Pack x, but the attribute is deleted in WebSphere
Commerce Version 7 Feature Pack y base. This delta
cannot be migrated using click-to-merge. Example Before
customization, an element in Feature Pack x was:
When
you customized, you changed the value of the parentProperty attribute
in this element from true to false: In
Feature Pack y, the parentProperty attribute
is deleted from this element: In
such a case, the customization you made to the parentProperty attribute
in Feature Pack x cannot be migrated automatically
to Feature Pack y using click-to-merge. |
The value of this attribute in Feature Pack x is
not empty. However, the value in Feature Pack y base
is changed to a new value that is different from the value that you
modified in Feature Pack x. This delta cannot be
migrated using click-to-merge. Example Before customization,
an element in Feature Pack x was: When
you customized, you changed the value of the width attribute
in this element from 120 to 100: In
Feature Pack y, the value of width attribute
is changed to 90. In
such a case, the customization you made to the width attribute
in Feature Pack x cannot be migrated automatically
to Feature Pack y using click-to-merge. |
|
You modified the value of an attribute in Feature
Pack x, but in Feature Pack y base,
the element where this attribute exists is deleted. This delta cannot
be migrated using click-to-merge. Example Before customization,
an element in Feature Packx was: When
you customized, you changed the value of the width attribute
in this element from 120 to 100: In
Feature Pack y, this element is deleted. In such
a case, the customization you made to the width attribute
in Feature Pack x cannot be migrated automatically
to Feature Pack y using click-to-merge. |
|
Add Attribute | You added an attribute in Feature Pack x,
but the element where you added the attribute does not exist in WebSphere
Commerce Version 7 Feature Pack y base. This delta
cannot be migrated using click-to-merge. Example Before
customization, an element in Feature Pack x is: When
you customized, you added a height attribute to this
element: In
Feature Pack y, this element no longer exists.
In such a case, the customization you made to add the height attribute
in Feature Pack x cannot be migrated automatically
to Feature Pack y using click-to-merge. |
Delete Attribute | You deleted an attribute in Feature Pack x,
but the element where you deleted the attribute does not exist in
WebSphere Commerce Version 7 Feature Pack y base.
This delta cannot be migrated using click-to-merge. Example Before
customization, an element in Feature Pack x is: When
you customized, you deleted the width attribute from
this element: In
Feature Pack y, this element no longer exists.
In such a case, the customization you made to delete the width attribute
in Feature Pack x cannot be migrated automatically
to Feature Pack y using click-to-merge. |
Add element | You added an element in Feature Pack x,
but the parent element of the element you added does not exist in
WebSphere Commerce Version 7 Feature Pack y base.
This delta cannot be migrated using click-to-merge. Example Before
customization, the parent element in Feature Pack x is: When you customized, you added a child
element, PropertyCombobox , to this element: In Feature Pack y,
the parent element no longer exists. In such a case, the customization
you made to add the PropertyCombobox element in Feature
Pack x cannot be migrated automatically to Feature
Pack y using click-to-merge. |
Delete element | This delta can always be migrated using click-to-merge, except if the corresponding element no longer exists in Feature Pack y base. In such a case, the delta is placed in migrated status automatically. No additional steps are required to migrate the delta. |
Reorder element | The number of reordered elements in WebSphere
Commerce Version 7 Feature Pack x is different
from the number in WebSphere Commerce Version 7 Feature Pack y base.
This delta cannot be migrated using click-to-merge. Example Before
customization, these elements were the child elements under a parent
element in Feature Pack x: After you customized, the child element were reordered
like this: But in Feature Pack y, one of the child
elements that was in Feature Pack x no longer exists: In such a case, all the reordered elements
in Feature Pack x cannot be migrated automatically
to Feature Pack y using click-to-merge. |
The number of reordered elements between Feature
Pack x and Feature Pack y is
same, but at least one reordered element in Feature Pack x is
deleted in Feature Pack y. Example Before
customization, these elements were the child elements under a parent
element in Feature Pack x: After you customized, the child element
were reordered like this example: But in Feature Pack y,
one of the child elements in Feature Pack x, storeId ,
no longer exists. Instead, there is a new child element, masterCatalogId : In such a case, all the reordered
elements in Feature Pack x cannot be migrated automatically
to Feature Pack y using click-to-merge. |
|
Modify text value | The text value you customized in WebSphere Commerce
Version 7 Feature Pack x is deleted in WebSphere
Commerce Version 7 Feature Pack y base. This delta
cannot be migrated using click-to-merge. Example Before
customization, an element with a text node in Feature Pack x was: When you customized,
you changed the text value of this element in Feature Pack x from
1 to 99: In
Feature Pack y, this element no longer exists.
In such a case, the modified text value in Feature Pack x cannot
be migrated automatically to Feature Pack y using
click-to-merge. |
Delete file | This customization can be always migrated using click-to-merge. |
Add file | This customization can be always migrated using click-to-merge. Choose the Migrate this file option from the context menu. |