This commit hook implementation is responsible for resolving conflicts. It does so by detecting the presence of conflict markers added by the Microkernel and delegating to a {@link org.apache.jackrabbit.oak.spi.commit.ConflictHandler}for resolving the conflicts.
@see org.apache.jackrabbit.mk.api.MicroKernel#rebase(String,String)
All source code are property of their respective owners. Java is a trademark of Sun Microsystems, Inc and owned by ORACLE Inc. Contact coftware#gmail.com.