Projects >> intellij-community >>8583a9be54a4aac318f92e748dab5c6158a8e78c

Chunk
Conflicting content
    }
    else {
      LOG.error(e);
        SVNErrorCode.WC_PATH_NOT_FOUND.equals(errorCode) ||
        SVNErrorCode.UNVERSIONED_RESOURCE.equals(errorCode) ||
        SVNErrorCode.WC_NOT_WORKING_COPY.equals(errorCode)) {
      LOG.debug(e);

  private void handleInfoException(SVNException e) {
    final SVNErrorCode errorCode = e.getErrorMessage().getErrorCode();
<<<<<<< HEAD
    if (!myLogExceptions ||
=======

    if (SVNErrorCode.WC_PATH_NOT_FOUND.equals(errorCode) ||
        SVNErrorCode.UNVERSIONED_RESOURCE.equals(errorCode) ||
        SVNErrorCode.WC_NOT_WORKING_COPY.equals(errorCode) ||
        // thrown when getting info from repository for non-existent item - like HEAD revision for deleted file
        SVNErrorCode.ILLEGAL_TARGET.equals(errorCode)) {
      LOG.debug(e);
>>>>>>> 3077f6c6568aaf22e61449ce64ec64c0330f353a
    }
    else {
      LOG.error(e);
Solution content
  private void handleInfoException(SVNException e) {
    final SVNErrorCode errorCode = e.getErrorMessage().getErrorCode();

    if (!myLogExceptions || 
        SVNErrorCode.WC_PATH_NOT_FOUND.equals(errorCode) ||
        SVNErrorCode.UNVERSIONED_RESOURCE.equals(errorCode) ||
        SVNErrorCode.WC_NOT_WORKING_COPY.equals(errorCode) ||
        // thrown when getting info from repository for non-existent item - like HEAD revision for deleted file
        SVNErrorCode.ILLEGAL_TARGET.equals(errorCode)) {
      LOG.debug(e);
    }
    else {
      LOG.error(e);
File
SvnVcs.java
Developer's decision
Combination
Kind of conflict
If statement
Method invocation