|
Lines 1704-1710
Link Here
|
| 1704 |
replace the current file with the new one. For most |
1704 |
replace the current file with the new one. For most |
| 1705 |
unmodified files, this is the best option.</para> |
1705 |
unmodified files, this is the best option.</para> |
| 1706 |
<para>Choosing to merge the file will present a text editor, and |
1706 |
<para>Choosing to merge the file will present a text editor and |
| 1707 |
the contents of both files. The files can be merged by |
1707 |
the contents of both files. The files can be merged by |
| 1708 |
reviewing both files side by side on the screen, and choosing |
1708 |
reviewing both files side by side on the screen, and choosing |
| 1709 |
parts from both to create a finished product. When the files |
1709 |
parts from both to create a finished product. When the files |