diff --git a/reckon-core/src/main/java/org/ajoberstar/reckon/core/Reckoner.java b/reckon-core/src/main/java/org/ajoberstar/reckon/core/Reckoner.java index e2f0bec..5ac4971 100644 --- a/reckon-core/src/main/java/org/ajoberstar/reckon/core/Reckoner.java +++ b/reckon-core/src/main/java/org/ajoberstar/reckon/core/Reckoner.java @@ -92,9 +92,10 @@ private Version reckonNormal(VcsInventory inventory) { } var targetNormal = inventory.getBaseNormal().incrementNormal(scope); + var probableStage = stageCalc.calculate(inventory, targetNormal); // if a version's already being developed on a parallel branch we'll skip it - if (inventory.getParallelNormals().contains(targetNormal)) { + if (inventory.getParallelNormals().contains(targetNormal) && probablStage.isPresent()) { if (scope.compareTo(parallelBranchScope) < 0) { logger.debug("Skipping {} as it's being developed on a parallel branch. While {} was requested, parallel branches claim a {}, using that instead.", scope, parallelBranchScope); targetNormal = targetNormal.incrementNormal(parallelBranchScope);