<?xml version="1.0" encoding="UTF-8"?>
<!--***********************************************************************
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
*
* - GNU Lesser General Public License Version 2.1
* - Sun Industry Standards Source License Version 1.1
*
* Sun Microsystems Inc., October, 2000
*
* GNU Lesser General Public License Version 2.1
* =============================================
* Copyright 2000 by Sun Microsystems, Inc.
* 901 San Antonio Road, Palo Alto, CA 94303, USA
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License version 2.1, as published by the Free Software Foundation.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
*
* Sun Industry Standards Source License Version 1.1
* =================================================
* The contents of this file are subject to the Sun Industry Standards
* Source License Version 1.1 (the "License"); You may not use this file
* except in compliance with the License. You may obtain a copy of the
* License at http://www.openoffice.org/license.html.
*
* Software provided under this License is provided on an "AS IS" basis,
* WITHOUT WARRUNTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING,
* WITHOUT LIMITATION, WARRUNTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
* MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
* See the License for the specific provisions governing your rights and
* obligations concerning the Software.
*
* The Initial Developer of the Original Code is: Sun Microsystems, Inc..
*
* Copyright: 2000 by Sun Microsystems, Inc.
*
* All Rights Reserved.
*
* Contributor(s): _______________________________________
*
*
************************************************************************--><helpdocument version="1.0">
<meta>
<topic id="textsharedguideredlining_docmergexml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">Merging Versions</title>
<filename>/text/shared/guide/redlining_docmerge.xhp</filename>
</topic>
<history>
<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
<lastedited date="2003-10-31T00:00:00">converted from old format - fpe</lastedited>
</history>
</meta>
<body>
<bookmark branch="index" xml-lang="en-US" id="bm_id3154230"><bookmark_value>documents; merging</bookmark_value><bookmark_value>merging; documents</bookmark_value></bookmark><paragraph id="hd_id3154230" role="heading" level="1" oldref="17" l10n="U" xml-lang="en-US"><variable id="redlining_docmerge"><link href="text/shared/guide/redlining_docmerge.xhp" name="Merging Versions">Merging Versions</link></variable></paragraph>
<paragraph role="paragraph" id="par_id3153049" l10n="U" xml-lang="en-US" oldref="19">When a document has been edited by more than one person, it is possible to merge the edited copies into the original. The only requirement is that the documents differ only and exclusively in the recorded changes - all other original text must be identical.</paragraph>
<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3152425" l10n="U" xml-lang="en-US" oldref="20">Open the original document into which you want to merge all copies.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" role="listitem" id="par_id3149177" l10n="U" oldref="21">Choose <emph>Edit - Changes - Merge Document</emph>. A file selection dialog appears.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3147576" l10n="U" xml-lang="en-US" oldref="23">Select the copy of the document from the dialog. If there have been no subsequent changes to the original document, the copy is merged into the original.</paragraph>
<paragraph role="listitem" id="par_id3149182" l10n="U" xml-lang="en-US" oldref="24">If changes have been made to the original document, an error dialog appears that informs you that the merge is unsuccessful.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3154749" l10n="U" xml-lang="en-US" oldref="22">After you merge the documents you will see the recorded changes from the copy in the original document.</paragraph>
</listitem>
</list>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/shared/guide/redlining.xhp#redlining"/>
<embed href="text/shared/guide/redlining_enter.xhp#redlining_enter"/>
<embed href="text/shared/guide/redlining_accept.xhp#redlining_accept"/>
<embed href="text/shared/guide/redlining_doccompare.xhp#redlining_doccompare"/>
<embed href="text/shared/guide/redlining_versions.xhp#redlining_versions"/>
</body>
</helpdocument>