Use this page to review the changes in the work that will be delivered to the personal stream and change the default resolutions.
|
Button |
|
|
Previous Difference |
Select the previous item that has a difference. |
|
Next Difference |
Select the next item that has a difference. |
|
Previous Unresolved Conflict |
Select the previous item that has a conflict where no resolution has been selected. |
|
Next Unresolved Conflict |
Select the next item that has a conflict where no resolution has been selected. |
|
Compare |
Open your default file merge tool and compare the item in the work area with the item in the repository. |
|
Discard |
Discard this item and do not shelve it. |
|
Hide Unchanged |
Hide item files that have the change type Unchanged. |
|
Hide Ignored |
Hide item files that have the resolution Ignored. |
|
Accept |
Accept this item and shelve it to the personal stream. |
|
Ignore |
Ignore the item so that it is not shelved. |
|
Field |
Description |
|
Filename |
The item filename and path. |
|
Change type column |
The change between the work area item and the repository item, for example, Addition or Deletion. |
|
Resolution column |
The default action to be performed on the change. |
|
Repository Filename column |
The original filename in the repository (if it has changed). |
Use this tab to specify default options.
|
Field |
Description |
Rules and Guidelines |
|
Comment |
A description of the items being shelved. |
|
|
Relate to request(s) |
Specify one or more requests that will be related In Response To the items being shelved. |
<Use default>: the default request for the stream will be used. |
|
Design part for new files. |
Specify the part specification of the owning design part for the items being shelved. |
<Use default>: the default design part for the stream will be used. |
|
Permissions after shelve |
Select the permission to be given to the files in the work area after they have been shelved. |
Choose Make read only or Keep unchanged. |
|
Expand substitution variables |
Expand item header substitution variables for items being shelved. |
Item headers are only expanded if the item type has Enable item header substitution set in the Administration Console. |
Use this tab to override the default options for the selected file or folder.
|
Field |
Description |
Rules and Guidelines |
|
Comment |
Describes the item being shelved. |
|
|
Requests |
Specify one or more requests that will be related In Response To this item when it is shelved. |
<Use default>: the default request for the stream will be used. |
|
New Revision |
Specify the revision number of the item being shelved. |
|
|
Item Specification. |
The item specification for a new item |
Only displayed if a new item is being shelved. |
|
Item type |
The item type to be assigned to a new item. Accept the default or select another item type from the list. |
Only displayed if a new item is being shelved. |
|
Format |
The file format for a new item. |
Only displayed if a new item is being shelved. |
|
Design part for new files |
Specify the part specification of the owning design part for the item being shelved. |
Only displayed if a new item is being shelved. <Use default>: the default design part for the stream will be used. |
|
Permissions after shelve |
Select the permission to be given to the item in the work area after it has been shelved. |
Choose Make read only or Keep unchanged. |
Use this tab to view the details of the selected file or folder.
|
Field |
Description |
|
Details |
A description of the change or conflict. |
|
Local item specification |
The item specification of the file in the work area. |
|
Repository item specification |
The item specification of the file in the repository. |
|
Originator |
The user that created the item revision in the repository. |