Manage import merge conflicts

Manage import merge conflicts

FactoryTalk Design Studio
 has two types of IntelliCENTER datasets:
  • Pre-shipment
  • Post-shipment
Pre-shipment IntelliCENTER dataset
At order entry, you have the option to request an electronic delivery of the dataset that represents your MCC order at that time. The pre-shipment dataset does not include documentation and does not include all the device specific information, such as device serial numbers, firmware versions, and other details. The pre-shipment dataset provides a way for you to begin early integration with a controller and early pre-commissioning design work.
Post-shipment IntelliCENTER dataset
After your MCC hardware order is manufactured, a post-shipment dataset is provided either through electronic delivery or physical media delivery. The post-shipment dataset represents the as-built custom order. The dataset includes custom documentation, including schematics, user manuals, and spare parts lists. The dataset also includes specific as-built device information, including serial numbers, IP addresses, firmware versions, and other details.
Choose to import a pre-shipment dataset or a post-shipment dataset. If you start with a pre-shipment dataset, you can upgrade to a post-shipment dataset using one of two options:
  • Overwrite the pre-shipment dataset with the post-shipment dataset. You lose any changes made to the pre-shipment dataset.
  • Merge the pre-shipment and post-shipment datasets. This option takes you through the lineup, highlights differences between the pre-shipment and post-shipment lineups, and lets you choose which changes to keep from either the pre-shipment or the post-shipment lineup.
    • When upgrading to a post-shipment dataset
      :
      1. Identify the pre-shipment badge in the IntelliCENTER explorer tree at the lineup level or on the IntelliCENTER dashboard after the lineup name.
      2. In the IntelliCENTER explorer or the
        Elevation
         view, at the lineup level, from the menu, select
        Upgrade to post-shipment
        .
      3. Select to import the matching post-shipment lineup.
      4. Select to either overwrite the current lineup or to merge the differences. If you choose to merge the differences, a wizard opens and highlights the differences between the two lineups for you to choose which differences to keep or to discard. The import continues when all the conflicts are resolved.
Resolve conflicts for newly imported lineups
When importing a new lineup, a conflict may occur. You have the option to overwrite the existing lineup or create a new lineup.
You must resolve one of two conflicts:
  • A conflict with a newly imported lineup with a unique IntelliCENTER ID and the same name as an existing lineup in the project.
  • A conflict with a newly imported lineup with a different name and the same IntelliCENTER ID as an existing lineup in the project.
To resolve the conflict:
Choose between these two options:
  • Select
    Overwrite
     to replace the previous lineup in the project with the new lineup.
    or
  • Select
    Add a new lineup
     to keep the current lineup in the project and add the new lineup to the project.
Provide Feedback
Have questions or feedback about this documentation? Please submit your feedback here.