ActionListener (final TreeConflictDescription description) { if (isDifferentURLs(description)) { return null; } // my edit, theirs move or delete if (ConflictAction.EDIT.equals(description.getConflictAction()) && description.getSourceLeftVersion() != null && ConflictReason.DELETED.equals(description.getConflictReason()) && (myChange.isMoved() || myChange.isRenamed()) && myCommittedRevision != null) { if (myPath.isDirectory() == description.getSourceRightVersion().isDirectory()) { return createMergeTheirsForFile(description); } } return null; }