The current Wiki page (https://wiki.jenkins-ci.org/display/JENKINS/Subversion+Merge+Plugin#) provides good information on the features of the Subversion Merge plug-in, but it does not include information on the merge conflict scenarios. More information on Jenkins' behaviour in this scenario, and actions that user must take to resolve the conflict, would be helpful. Please see if this can be added as an improvement. Thanks.