[svnbook] r5080 committed - trunk/en/book/ch02-basic-usage.xml
cmpilato at users.sourceforge.net
cmpilato at users.sourceforge.net
Tue Feb 2 12:30:51 CST 2016
Revision: 5080
http://sourceforge.net/p/svnbook/source/5080
Author: cmpilato
Date: 2016-02-02 18:30:50 +0000 (Tue, 02 Feb 2016)
Log Message:
-----------
* en/book/ch02-basic-usage.xml
Further tweak the conflict-resolution-related index term definitions
to combine the 'conflicts/resolving' and 'conflicts/resolution'
spaces.
Modified Paths:
--------------
trunk/en/book/ch02-basic-usage.xml
Modified: trunk/en/book/ch02-basic-usage.xml
===================================================================
--- trunk/en/book/ch02-basic-usage.xml 2016-02-02 18:11:38 UTC (rev 5079)
+++ trunk/en/book/ch02-basic-usage.xml 2016-02-02 18:30:50 UTC (rev 5080)
@@ -1287,7 +1287,7 @@
<para>
<indexterm>
<primary>conflicts</primary>
- <secondary>resolving</secondary>
+ <secondary>resolution</secondary>
</indexterm>We've already seen how <userinput>svn status
-u</userinput> can predict conflicts, but dealing with those
conflicts is still something that remains to be done.
@@ -1545,13 +1545,12 @@
<title>Resolving conflict differences interactively</title>
- <indexterm>
- <primary>conflicts</primary>
- <secondary>resolution</secondary>
- <tertiary>interactive</tertiary>
- </indexterm>
-
- <para>There are several different ways to resolve conflicts
+ <para>
+ <indexterm>
+ <primary>conflicts</primary>
+ <secondary>resolution</secondary>
+ <tertiary>interactive</tertiary>
+ </indexterm>There are several different ways to resolve conflicts
interactively—two of which allow you to selectively
merge and edit changes, the rest of which allow you to
simply pick a version of the file and move along.</para>
@@ -1606,13 +1605,12 @@
<title>Postponing conflict resolution</title>
- <indexterm>
- <primary>conflicts</primary>
- <secondary>resolution</secondary>
- <tertiary>postponing</tertiary>
- </indexterm>
-
- <para>This may sound like an appropriate section for avoiding
+ <para>
+ <indexterm>
+ <primary>conflicts</primary>
+ <secondary>resolution</secondary>
+ <tertiary>postponing</tertiary>
+ </indexterm>This may sound like an appropriate section for avoiding
marital disagreements, but it's actually still about
Subversion, so read on. If you're doing an update and
encounter a conflict that you're not prepared to review or
@@ -1815,13 +1813,12 @@
<sect3 id="svn.tour.cycle.resolve.byhand">
<title>Manual conflict resolution</title>
- <indexterm>
- <primary>conflicts</primary>
- <secondary>resolution</secondary>
- <tertiary>manual</tertiary>
- </indexterm>
-
- <para>Manually resolving conflicts can be quite intimidating the
+ <para>
+ <indexterm>
+ <primary>conflicts</primary>
+ <secondary>resolution</secondary>
+ <tertiary>manual</tertiary>
+ </indexterm>Manually resolving conflicts can be quite intimidating the
first time you attempt it, but with a little practice, it
can become as easy as falling off a bike.</para>
@@ -1946,6 +1943,7 @@
<indexterm>
<primary>conflicts</primary>
<secondary>resolution</secondary>
+ <tertiary>discarding local changes</tertiary>
</indexterm>If you get a conflict and decide that you want
to throw out your changes, you can run <userinput>svn
resolve --accept theirs-full
@@ -1979,7 +1977,12 @@
<sect3 id="svn.tour.cycle.resolve.revert">
<title>Punting: using svn revert</title>
- <para>If you decide that you want to throw out your changes
+ <para>
+ <indexterm>
+ <primary>conflicts</primary>
+ <secondary>resolution</secondary>
+ <tertiary>discarding local changes</tertiary>
+ </indexterm>If you decide that you want to throw out your changes
and start your edits again (whether this occurs after a
conflict or anytime), just revert your changes:</para>
More information about the svnbook-dev
mailing list