Resolving Conflicting Updates | SharePoint Tutorial pdf

Resolving Conflicting Updates

If you make a copy of a document while it was checked out, you can edit that copy later even though the original file has been checked back in. When you close the file, Office attempts to send your changes to SharePoint; if someone else has edited the file since you opened your copy, Office displays the Document Updates task pane (Figure).
Figre : Using the Document Updates task pane

At that point you can merge the two files, re-enter your changes, discard your changes, or overwrite the other user’s changes. Merging sounds like a good idea, but it rarely turns out well. You usually have to manually compare the documents and re-enter your changes in the SharePoint copy.