[svnbook] r5149 committed - trunk/en/book/ch02-basic-usage.xml

lyalyakin at users.sourceforge.net lyalyakin at users.sourceforge.net
Mon May 30 10:23:14 CDT 2016


Revision: 5149
          http://sourceforge.net/p/svnbook/source/5149
Author:   lyalyakin
Date:     2016-05-30 15:23:14 +0000 (Mon, 30 May 2016)
Log Message:
-----------
Issue #266.

* en/book/ch02-basic-usage.xml
  (svn.tour.cycle.resolve.resolve): Let's tell that `m` (merge)
  command is the main way to resolve conflicts interactively. Added
  <screen> of the internal merge tool, too.

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-05-30 12:59:07 UTC (rev 5148)
+++ trunk/en/book/ch02-basic-usage.xml	2016-05-30 15:23:14 UTC (rev 5149)
@@ -1565,12 +1565,48 @@
             <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>
+          </indexterm>The main way to resolve conflicts interactively
+          is to use an internal merge tool.  The tool asks you what to
+          do with each conflicting change and allows you to
+          selectively merge and edit changes.  However, there are
+          several other different ways to resolve conflicts
+          interactively—two of them allow you to selectively
+          merge and edit changes using external editors, the rest of
+          which allow you to simply pick a version of the file and
+          move along.  Internal merge tool combines all of the
+          available ways to resolve conflicts.</para>
 
-        <para>If you wish to choose some combination of your local
+        <para>You've already reviewed the conflicting changes, so its
+          now time to resolve the conflicts.  The first command that
+          should help you is the <quote>merge</quote> command
+          (<userinput>m</userinput>) which displays the conflicting
+          lines and allows you to choose from a number of options:
+         </para>
+
+        <informalexample>
+          <screen>
+Select: (p) postpone, (df) show diff, (e) edit file, (m) merge,
+        (mc) my side of conflict, (tc) their side of conflict,
+        (s) show all options: m
+Merging 'Makefile'.
+Conflicting section found during merge:
+(1) their version (at line 24)                  |(2) your version (at line 24)
+------------------------------------------------+------------------------------------------------
+top_builddir = /bar                             |top_builddir = /foo
+------------------------------------------------+------------------------------------------------
+Select: (1) use their version, (2) use your version,
+        (12) their version first, then yours,
+        (21) your version first, then theirs,
+        (e1) edit their version and use the result,
+        (e2) edit your version and use the result,
+        (eb) edit both versions and use the result,
+        (p) postpone this conflicting section leaving conflict markers,
+        (a) abort file merge and return to main menu:
+</screen>
+        </informalexample>
+
+        <para>However, if you wish to use an external editor to choose some
+          combination of your local
           changes, you can use the <quote>edit</quote> command
           (<userinput>e</userinput>) to manually edit the file with
           conflict markers in a text editor (configured per the
@@ -1592,15 +1628,7 @@
           <xref linkend="svn.advanced.externaldifftools.merge"
           />).</para>
 
-        <para>If you decide that you don't need to merge any changes,
-          but just want to accept one version of the file or the
-          other, you can either choose your changes (a.k.a.
-          <quote>mine</quote>) by using the <quote>mine-full</quote>
-          command (<userinput>mf</userinput>) or choose theirs by using the
-          <quote>theirs-full</quote> command
-          (<userinput>tf</userinput>).</para>
-
-        <para>Finally, there is also a pair of compromise options
+        <para>There is also a pair of compromise options
           available.  The <quote>mine-conflict</quote>
           (<userinput>mc</userinput>)
           and <quote>theirs-conflict</quote>
@@ -1613,6 +1641,14 @@
           the server in regions of the file where no conflict was
           detected.</para>
 
+        <para>Finally, if you decide that you don't need to merge any changes,
+          but just want to accept one version of the file or the
+          other, you can either choose your changes (a.k.a.
+          <quote>mine</quote>) by using the <quote>mine-full</quote>
+          command (<userinput>mf</userinput>) or choose theirs by using the
+          <quote>theirs-full</quote> command
+          (<userinput>tf</userinput>).</para>
+
       </sect3>
 
       <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->





More information about the svnbook-dev mailing list