svn commit: r1840930 - /subversion/site/publish/docs/release-notes/1.11.html

[ju...@apache.org]

Author: julianfoad
Date: Fri Sep 14 14:16:56 2018
New Revision: 1840930

URL: http://svn.apache.org/viewvc?rev=1840930&view=rev
Log:
* publish/docs/release-notes/1.11.html: Add a brief conflict-resolver section.

Modified:
    subversion/site/publish/docs/release-notes/1.11.html

Modified: subversion/site/publish/docs/release-notes/1.11.html
URL: http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/1.11.html?rev=1840930&r1=1840929&r2=1840930&view=diff
==============================================================================
--- subversion/site/publish/docs/release-notes/1.11.html (original)
+++ subversion/site/publish/docs/release-notes/1.11.html Fri Sep 14 14:16:56 2018
@@ -39,6 +39,8 @@
       >Improved Shelving (experimental)</a></li>
   <li><a href="#checkpointing"
       >Checkpointing (experimental)</a></li>
+  <li><a href="#conflict-resolver"
+      >Improvements to the Conflict Resolver</a></li>
   <li><a href="#enhancements"
       >Many enhancements and bug fixes</a></li>
   <li><a href="#issues"
@@ -349,6 +351,21 @@ prefix.</p>
 
 </div>  <!-- shelving -->
 
+<div class="h4" id="conflict-resolver">
+<h4>Improvements to the interactive conflict resolver
+  <a class="sectionlink" href="#conflict-resolver"
+     title="Link to this section">&para;</a>
+</h4>
+
+<p>See in particular
+  <a href="https://issues.apache.org/jira/browse/SVN-4694">issue #4694</a>
+  "Unresolvable tree conflict when cherrypicking a file-edit after file was
+  moved on source branch" and
+  <a href="https://issues.apache.org/jira/browse/SVN-4766">issue #4766</a>
+  "resolver adds unrelated moves to move target list".</p>
+
+</div> <!-- conflict-resolver -->
+
 </div> <!-- cmdline -->
 
 <div class="h3" id="server-side-improvements">