ConflictState (@Nullable Status svnStatus) { ConflictState result = svnStatus != null ? ConflictState.from(svnStatus) : ConflictState.none; if (result.isTree()) { //noinspection ConstantConditions reportTreeConflict(svnStatus); } return result; }