X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/9fb15ec9fec8903776be0be01eaed0e7bb7d5009..5b494e1b636f4c26c14c9cf8f964bef0a70c784a:/doc/bugs/svn_commit_failures_interpreted_as_merge_conflicts.mdwn

diff --git a/doc/bugs/svn_commit_failures_interpreted_as_merge_conflicts.mdwn b/doc/bugs/svn_commit_failures_interpreted_as_merge_conflicts.mdwn
index 09753b4ee..0c9bce4b9 100644
--- a/doc/bugs/svn_commit_failures_interpreted_as_merge_conflicts.mdwn
+++ b/doc/bugs/svn_commit_failures_interpreted_as_merge_conflicts.mdwn
@@ -13,3 +13,9 @@ However there are no merge conflict markers in the page. My apache error log say
     [Fri Apr 30 16:43:57 2010] [error] [client 10.64.64.42] svn: Authorization failed, referer: https://unixwiki.ncl.ac.uk/ikiwiki.cgi
 
 -- [[Jon]]
+
+> Only way for this to be improved would be for the svn plugin to
+> explicitly check the file for conflict markers. I guess it could
+> change the error message then, but the actual behavior of putting the
+> changed file back in the editor so the user can recommit is about right
+> as far as error recovery goes. --[[Joey]]