Conflicts Found Dialog Box (Advanced Mode)

This dialog lists any conflict found during Closedvarious ASCET-SCM operations, together with details about the nature of the conflict. For instance, a conflict may be reported via this dialog box if a different version of the same item(s) is already contained in ASCET.

SCM operation

See also

Get Lock

Locking an Item

Release Lock

Unlocking an Item

Update

Updating Items (Advanced Mode)

Update to Latest

Updating Items to Latest Revision (Advanced Mode)

Update and Lock

Updating Items to Latest Revision (Advanced Mode) and Locking an Item

Commit

Committing an Item

Checkout

Checking Out Items (Advanced Mode)

Edit without Lock

Editing Items in Offline Mode

Commit New Revision Without Lock

Get Lock for Configuration

Locking a Configuration

Release Lock for Configuration

Unlocking a Configuration

Update Configuration

Updating Configurations (Advanced Mode)

Update to Latest Configuration

Updating Configurations to Latest Revision (Advanced Mode)

Commit Configuration

Committing a Configuration (Advanced Mode)

Checkout Configuration

Checking out a Configuration (Advanced Mode)

Critical conflicts are always shown. Conflicts that cause existing items to be overwritten in the ASCET database/workspace are only shown if the Warn of Conflicts option is activated.

The Conflicts Found dialog box contains the following elements:

Elements with Conflicts list

Lists all ASCET elements that cause a conflict during the ASCET-SCM operation. You can right-click on the list to open the Closedcontext menu for the Conflicts Found dialog box.

Remove selected items from list

Excludes the selected item from the operation.

Undo Remove selected items from list

Re-includes a removed item into the operation.

Write to Log

Writes the revision history of the selected items to a log file. A separate browser is displayed via which you can specify or select this log file.

Previous

Returns to the previous display page (and thus to the previous step) in the operation.

Next

Displays the next page of this dialog box.

<action>

This button continues the operation.

The name of this button depends on the operation you are performing. One possible name is, e.g., Checkout.

Cancel

Closes the dialog box and discards the operation.

See also

Conflicts