<html><head><title>Doing A Merge</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="home" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="dirmerge.html" title="Chapter 3. Directory Comparison and Merge with KDiff3"><link rel="previous" href="dirmergevisible.html" title="Visible Information"><link rel="next" href="dirmergeoptions.html" title="Options for Comparing and Merging Directories"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><table border="0" cellpadding="0" cellspacing="0" width="100%"><tr class="header"><td colspan="2"> </td></tr><tr id="logo"><td valign="top"><img src="common/kde_logo.png" alt="KDE - The K Desktop Environment" width="296" height="79" border="0"></td><td valign="middle" align="center" id="location"><h1>Doing A Merge</h1></td></tr></table><table width="100%" class="header"><tbody><tr><td align="left" class="navLeft" width="33%"><a accesskey="p" href="dirmergevisible.html">Prev</a></td><td align="center" class="navCenter" width="34%">Directory Comparison and Merge with KDiff3</td><td align="right" class="navRight" width="33%">
<a accesskey="n" href="dirmergeoptions.html">Next</a></td></tr></tbody></table><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="dothemerge"></a>Doing A Merge</h2></div></div><div></div></div><p>
You can either merge the currently selected item (file or directory), or all items.
When you have made all your operation choices (in all subdirectories too)
then you can start the merge.
</p><p>
Be aware that if you didn't specify a destination directory explicitely,
then the destination will be "C" in three directory mode, "B" in two directory
merge mode, and in sync-mode it will be "A" or/and "B".
</p><p>
If you have specified a destination directory also check that all items
that should be in the output, are in the tree. There are some options that
cause certain items to be omitted from the directory comparison and merge.
Check these options to avoid unpleasant surprises:
</p><div class="itemizedlist"><ul type="disc"><li><p>"Recursive Directories": If this is off, then items in subdirectories
will not be found.</p></li><li><p>"Pattern"/"Anti-Pattern": Include/exclude items that match</p></li><li><p>"Exclude Hidden Files"</p></li><li><p>"List only Deltas": Files that match in all directories don't appear
in the tree, and hence also not in the destination.</p></li></ul></div><p>
(In the current version, you must do a rescan via menu "Directory"->"Rescan"
yourself, after changing options affecting the directory scan.)
</p><p>
If you are satisfied so far, the rest is easy.
</p><p>
To merge all items: Select "Start/Continue directory merge" in the "Directory"-menu
or press F7 (which is the shortcut).
To merge only the current item: Select "Run Operation For Current Item"
or press F6.
</p><p>
If due to conflicting filetypes still some items with invalid operations
exist, then a messagebox will appear and these items will be pointed out,
so you can select a valid operation for the item.
</p><p>
If you merge all items a dialog will appear giving you the options "Do it", "Simulate
it" and "Cancel".
</p><div class="itemizedlist"><ul type="disc"><li><p>Select "Simulate it" if you want to see what would be done without
actually doing it. A verbose list of all operations will be shown.</p></li><li><p>Otherwise select "Do it" to really start merging.</p></li></ul></div><p>
Then KDiff3 will run the specified operation for all items. If manual
interaction is required (single file merge), then a merge window will open
(<a href="screenshots.html#dirmergebigscreenshot">see the big screenshot</a>).
</p><p>
When you have finished with a file, again select "Start/Continue directory
merge" or the key F7. If you haven't saved yet, a dialog will ask you to
do so. Then KDiff3 will continue with the next item.
</p><p>
When KDiff3 encounters an error, it will tell you so and will show the
verbose-status-information. At the bottom of this list, there will be some
error messages which should help you to understand the cause of the problem.
When you continue merging (F7 key) KDiff3 will give you the choice to retry
or skip the item that caused the problem. This means that before continuing
you can choose another operation or solve the problem by other means.
</p><p>
When the merge is complete, then KDiff3 will inform you via a message
box.
</p><p>
If some items were merged individually then KDiff3 remembers this (while this
merge-session goes on), and doesn't merge them again when later the merge for
all items is run. Even when the merge was skipped or nothing was saved these
items count as completed. Only when you change the merge operation the item
will be merged again.
</p></div><table width="100%" class="bottom-nav"><tr><td width="33%" align="left" valign="top" class="navLeft"><a href="dirmergevisible.html">Prev</a></td><td width="34%" align="center" valign="top" class="navCenter"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top" class="navRight"><a href="dirmergeoptions.html">Next</a></td></tr><tr><td width="33%" align="left" class="navLeft">Visible Information </td><td width="34%" align="center" class="navCenter"><a href="dirmerge.html">Up</a></td><td width="33%" align="right" class="navRight"> Options for Comparing and Merging Directories</td></tr></table></body></html>
distrib
>
Mandriva
>
10.2
>
i586
>
media
>
contrib
>
by-pkgid
>
a1a8a1511d610277a926fcdfef64386b
>
files
>
45
