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

lyalyakin at users.sourceforge.net lyalyakin at users.sourceforge.net
Mon May 30 15:40:55 CDT 2016


Revision: 5155
          http://sourceforge.net/p/svnbook/source/5155
Author:   lyalyakin
Date:     2016-05-30 20:40:54 +0000 (Mon, 30 May 2016)
Log Message:
-----------
Issue #266.

* en/book/ch02-basic-usage.xml
  (svn.tour.cycle.resolve.resolve): Postpone conflict resolution for certain areas,
  not just file-by-file.

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 20:29:39 UTC (rev 5154)
+++ trunk/en/book/ch02-basic-usage.xml	2016-05-30 20:40:54 UTC (rev 5155)
@@ -1607,6 +1607,11 @@
 </screen>
         </informalexample>
 
+        <para>As you can see, when you use the internal file merge tool,
+          you can cycle through individual conflicting areas in the
+          file and select various resolution options or postpone
+          conflict resolution for selected conflicts.</para>
+
         <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
@@ -1676,6 +1681,13 @@
           will be marked with a <computeroutput>C</computeroutput>
           automatically.</para>
 
+        <para>Beginning with Subversion 1.8, an internal file merge
+          tool allows you to postpone conflict resolution for certain
+          conflicts, but resolve other confilcts.  Therefore, you can
+          postpone conflict resolution area-by-area, not just on
+          file-to-file basis.
+          </para>
+
         <para>The <computeroutput>C</computeroutput>
           (for <quote>Conflicted</quote>) means that the changes from the
           server overlapped with your own, and now you have to





More information about the svnbook-dev mailing list