/*
* Since we provided no custom ISVNOptions implementation to SVNClientManager, our
* manager uses DefaultSVNOptions, which is set to all SVN*Client classes which the
* manager produces. So, we can cast ISVNOptions to DefaultSVNOptions.
*/
DefaultSVNOptions options = (DefaultSVNOptions) diffClient.getOptions();
//This way we set a conflict handler which will automatically resolve conflicts for those
//cases that we would like
options.setConflictHandler(new ConflictResolverHandler());
/* do the same merge call, merge-tracking feature will merge only those revisions
* which were not still merged.
*/
SVNRevisionRange rangeToMerge = new SVNRevisionRange(SVNRevision.create(1), SVNRevision.HEAD);