Domino.Doc 3.5 User's Guide - Lotus documentation - Lotus software

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.
Editing a document from Notes
After finding, opening and reading a document, you may want to edit it. A
document must be checked out for editing, and then checked back in. At
that time, you can choose to replace the original or create a new one. If you
find a document and choose Edit Document, it will automatically be
checked out for you (if not already checked out).
Chapter 6: Working with Domino.Doc from the Notes Client 101