User Help > Tracking Changes With Windchill RV&S Items > Resolving Conflicts When Editing an Item > To resolve conflicts when editing an item
  
To resolve conflicts when editing an item
When editing an item and another user changes the same item before you save your changes, the Editing Conflict dialog box displays. The specific changes made by the other user are listed.
1. Review the changes made by the other user, then do one of the following:
To automatically combine your changes with the other user’s changes, click Auto Resolve.
To discard your changes, click Cancel.
To resolve the editing conflict, click Resolve. The Edit Item view displays the changes made by the other user. Each tab containing editing conflicts is annotated with an icon and each field containing editing conflicts is annotated with an icon. For more information on the different icons, see “Editing Conflict Icons”.
* 
Placing the cursor over an icon next to a field displays a detailed tooltip about the changes made to the field. Depending on the length of the changes, the tooltip may be truncated.
2. Do one of the following:
To commit the changes to the database and resume resolving additional conflicts, click Apply.
* 
Each Apply operation is added to the item history.
When you commit item information to the database, fields in the item dynamically update based on relevance and editability rules. This means that what you can see and do in the item may change.
To commit the item information to the database and close the view, click OK. The revised item displays in the Item Detail view. For more information, see “Key Considerations”.
If another user edited the item while you were resolving conflicts, the Editing Conflict dialog box displays. Repeat steps 1 - 2.