Chapter 7 Working with Domino.Doc from a Browser - Lotus ...

The Checkout Conflict Notice, illustrated below, reports which document
attributes were modified (Document Profile, Document Security, or
Document Content). You can also access a table of some of the key fields in
your working copy and the master copy. Sometimes Domino.Doc cannot
determine what has been changed since your check-out request was issued
(for example, when a document gets checked in and a new version isn’t
created). In these cases, be very careful not to accidentally overwrite
someone else’s work. To review your working copy or the master copy;
click View Your Copy or View Master Copy respectively.
To resolve document check-out conflicts, determine which copy is correct,
your working copy or the master document, and do one of the following:
• Click Discard Changes to disregard your changes during check in.
• Click Merge Changes to selectively incorporate your changes into the
master document during check in.
Domino.Doc will redisplay the Checkout Conflict Notice and present
you with Conflict resolution options for profile conflicts, security
conflicts, and content conflicts.
Choose “Keep your changes” if your changes to this attribute are more
current; otherwise, choose “Discard your changes” even if you did not
change this attribute so your working copy does not overwrite the
master document during check-in.
If content conflicts exist, you may want to choose “Discard Changes”
which will update your working copy with the current master
document, and then you need to incorporate your edits into the most
current version.
Chapter 6: Working with Domino.Doc from the Notes Client 99