[svnbook commit] r2839 - trunk/src/en/book
C. Michael Pilato
cmpilato at red-bean.com
Mon Aug 13 09:05:13 CDT 2007
sussman wrote:
> Author: sussman
> Date: Sun Aug 12 21:29:15 2007
> New Revision: 2839
[...]
> @@ -823,14 +823,20 @@
> <sect3 id="svn.branchmerge.copychanges.bestprac.preview">
> <title>Previewing Merges</title>
>
> - <para>Because merging only results in local modifications,
> - it's not usually a high-risk operation. If you get the
> - merge wrong the first time, simply <command>svn
> - revert</command> the changes and try again.</para>
> -
> - <para>It's possible, however, that your working copy might
> - already have local modifications. The changes applied by a
> - merge will be mixed with your pre-existing ones, and running
> + <para>First: always remember to do your merge into a working
> + copy that has <emphasis>no</emphasis> local edits, and has
> + been recently updated. If your working copy
> + isn't <quote>clean</quote> in these ways, you can run into
> + some headaches.</para>
s/First:/First,/
--
C. Michael Pilato <cmpilato at red-bean.com>
"The Christian ideal has not been tried and found wanting. It has
been found difficult; and left untried." -- G. K. Chesterton
More information about the svnbook-dev
mailing list