Assumptions and Rules for Conflict Manipulation After Resynchronizing
In the assumptions and rules that follow for conflict manipulation, “undeleted” means that a deleted item has been restored by selecting > or clicking the corresponding toolbar button 
. Additionally, an “enabled node” is a node that is not part of a hierarchy that has been deleted.
. Additionally, an “enabled node” is a node that is not part of a hierarchy that has been deleted.Assumptions
• Nodes displaying conflict navigation icons 
are not real conflicts. Consequently, clicking a node that displays this icon does not display a conflict item header or the editable item preview.
are not real conflicts. Consequently, clicking a node that displays this icon does not display a conflict item header or the editable item preview.• It is possible for a node to have both an edit conflict 
and an informational conflict 
due to changes on the server. In this case, the row header and item header show the edit conflict icon. The information messages for both conflict types are shown in the item header. If you resynchronize after resolving the edit conflict, the row header and item header then show the informational conflict icon.
and an informational conflict due to changes on the server. In this case, the row header and item header show the edit conflict icon. The information messages for both conflict types are shown in the item header. If you resynchronize after resolving the edit conflict, the row header and item header then show the informational conflict icon.• Grayed out nodes cannot be manipulated directly nor acted on by enabled nodes. For more information, see Rules for Grayed Out Nodes.
General Notes about Manipulating Nodes with Conflicts
• All nodes that trace the path to the root from the node with a conflict have some sort of icon. If they do not have a conflict, they have a conflict navigation icon . Otherwise, they display their own conflict.
. Otherwise, they display their own conflict.• Moving a node with a conflict navigation icon out from a path to a conflict results in an enabled node with a moved item icon 
but no conflict. Moving it back into any path to any conflict restores the conflict navigation icon.
out from a path to a conflict results in an enabled node with a moved item icon but no conflict. Moving it back into any path to any conflict restores the conflict navigation icon.• If a node with a conflict is moved within the parent such that its path to the parent changes, the new path gets conflict navigation icons . Any nodes from the previous path that no longer lead to a conflict have their conflict navigation icons removed.
. Any nodes from the previous path that no longer lead to a conflict have their conflict navigation icons removed.Delete Conflicts
• Nodes with delete conflict icons 
can be moved, edited, and deleted after a resynchronization but must be undeleted first.
can be moved, edited, and deleted after a resynchronization but must be undeleted first.• Restoring a deleted item restores all nodes in the deleted hierarchy.
• Moving a node with a delete conflict icon 
retains its resolved conflict.
retains its resolved conflict.Clearing Conflicts
• Delete conflicts 
must be resolved before you can resynchronize or save again.
must be resolved before you can resynchronize or save again.• An edit conflict 
does not have to be resolved if the node it is on has been deleted.
does not have to be resolved if the node it is on has been deleted.• When you resynchronize again, all resolved delete conflicts, resolved edit conflicts, and informational conflicts disappear. Edit conflicts and informational conflicts are replaced with appropriate edited field icons 
and moved item icons .
and moved item icons .