svn commit: r1690076 - /jackrabbit/oak/trunk/oak-doc/src/site/markdown/FAQ.md

[al...@apache.org]

Author: alexparvulescu
Date: Thu Jul  9 12:19:00 2015
New Revision: 1690076

URL: http://svn.apache.org/r1690076
Log:
OAK-3057 Simplify debugging conflict related errors
  - added FAQ mention in the docs

Modified:
    jackrabbit/oak/trunk/oak-doc/src/site/markdown/FAQ.md

Modified: jackrabbit/oak/trunk/oak-doc/src/site/markdown/FAQ.md
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-doc/src/site/markdown/FAQ.md?rev=1690076&r1=1690075&r2=1690076&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-doc/src/site/markdown/FAQ.md (original)
+++ jackrabbit/oak/trunk/oak-doc/src/site/markdown/FAQ.md Thu Jul  9 12:19:00 2015
@@ -33,6 +33,13 @@ Enabling `DEBUG` logging for `SessionDel
 
 You need to setup a regular job for [compacting the segments](nodestore/segmentmk.html#Segment_Compaction).
 
+#### How do I debug merge conflict errors
+
+Debugging merge conflict errors is now possible by enabling `DEBUG` logs on
+`org.apache.jackrabbit.oak.plugins.commit.MergingNodeStateDiff` and
+`org.apache.jackrabbit.oak.plugins.commit.ConflictValidator`. 
+This option is available via [OAK-3057](https://issues.apache.org/jira/browse/OAK-3057) since Oak 1.0.17, 1.2.3, 1.3.3. 
+
 #### My question is not listed here
 
 Search the [Oak dev list](http://jackrabbit.markmail.org/search/+list:org.apache.jackrabbit.oak-dev)