Patent ID: 7975223

Claim:
A method of resolving a rejected content move in a document, comprising: causing a tracked movement of a portion of content of the document from a first location in the document to a second location in the document; receiving an indication of a rejection of the tracked movement of the portion of content from the first location in the document to the second location in the document; comparing a data representing a pre-move version of the portion of content with a data representing a post-move version of the portion of content to determine if the portion of content has been changed after it was moved to the second location in the document; providing a graphical representation of the pre-move version of the portion of content and a graphical representation the post-move version of the portion of content in a conflict resolution dialog that is displayed upon a determination that the post-move version of the portion of content is different than the pre-move version of the portion of content, wherein providing a graphical representation of the pre-move version of the portion of content and a graphical representation the post-move version of the portion of content in a conflict resolution dialog includes: preparing a first document for the pre-move version of the portion of content and preparing a second document for the post-move version of the portion of content and displaying the first and second documents in the conflict resolution dialog to allow a visual comparison of the pre-move version of the portion of content with the post-move version of the portion of content; receiving an indication, in the conflict resolution dialog, of a selection of one of the pre-move version of the portion of content or the post-move version of the portion of content simultaneously displayed in the conflict resolution dialog for moving the selected version back to the first location in the document; and moving the selected one of the pre-move version of the portion of content or the post-move version of the portion of content to the first location in the document.