More inheriting issues

[JakeGinnivan]

master and origin/master are the same thing.. would love to get rid of branch normalisation and solve this properly

[09:20:28][Step 2/2] INFO [12/14/17 1:20:28:55] Begin: Attempting to inherit branch configuration from parent branch
[09:20:28][Step 2/2]   INFO [12/14/17 1:20:28:55] HEAD is merge commit, this is likely a pull request using feature/SWM-4156_add-changelogs as base
[09:20:28][Step 2/2]   INFO [12/14/17 1:20:28:56] Begin: Finding branch source of 'feature/SWM-4156_add-changelogs'
[09:20:28][Step 2/2]     INFO [12/14/17 1:20:28:56] Begin: Finding merge base between 'feature/SWM-4156_add-changelogs' and 'origin/master'.
[09:20:28][Step 2/2]       INFO [12/14/17 1:20:28:57] Found merge base of 0d7175406073a092547b9421af893654e282b7f8
[09:20:28][Step 2/2]       INFO [12/14/17 1:20:28:58] Merge base of feature/SWM-4156_add-changelogs' and 'origin/master is 0d7175406073a092547b9421af893654e282b7f8
[09:20:28][Step 2/2]     INFO [12/14/17 1:20:28:58] End: Finding merge base between 'feature/SWM-4156_add-changelogs' and 'origin/master'. (Took: 11.15ms)
[09:20:28][Step 2/2]     INFO [12/14/17 1:20:28:58] Begin: Finding merge base between 'feature/SWM-4156_add-changelogs' and 'master'.
[09:20:28][Step 2/2]       INFO [12/14/17 1:20:28:58] Found merge base of 0d7175406073a092547b9421af893654e282b7f8
[09:20:28][Step 2/2]       INFO [12/14/17 1:20:28:58] Merge base of feature/SWM-4156_add-changelogs' and 'master is 0d7175406073a092547b9421af893654e282b7f8
[09:20:28][Step 2/2]     INFO [12/14/17 1:20:28:58] End: Finding merge base between 'feature/SWM-4156_add-changelogs' and 'master'. (Took: 0.30ms)
[09:20:28][Step 2/2]     INFO [12/14/17 1:20:28:59] Multiple source branches have been found, picking the first one (origin/master).
[09:20:28][Step 2/2] This may result in incorrect commit counting.
[09:20:28][Step 2/2] Options were:
[09:20:28][Step 2/2]  origin/master, master
[09:20:28][Step 2/2]   INFO [12/14/17 1:20:28:59] End: Finding branch source of 'feature/SWM-4156_add-changelogs' (Took: 29.61ms)
[09:20:28][Step 2/2]   INFO [12/14/17 1:20:28:59] Begin: Getting branches containing the commit '0d7175406073a092547b9421af893654e282b7f8'.
[09:20:28][Step 2/2]     INFO [12/14/17 1:20:28:59] Trying to find direct branches.
[09:20:28][Step 2/2]     INFO [12/14/17 1:20:28:59] No direct branches found, searching through tracked branches.
[09:20:28][Step 2/2]     INFO [12/14/17 1:20:28:59] Searching for commits reachable from 'origin/master'.
[09:20:28][Step 2/2]     INFO [12/14/17 1:20:28:59] The branch 'origin/master' has a matching commit.
[09:20:28][Step 2/2]     INFO [12/14/17 1:20:28:59] Searching for commits reachable from 'master'.
[09:20:28][Step 2/2]     INFO [12/14/17 1:20:28:59] The branch 'master' has a matching commit.
[09:20:28][Step 2/2]   INFO [12/14/17 1:20:28:59] End: Getting branches containing the commit '0d7175406073a092547b9421af893654e282b7f8'. (Took: 2.44ms)
[09:20:28][Step 2/2]   INFO [12/14/17 1:20:28:59] Begin: Getting branches containing the commit 'a10d86fbff08c87eac18aa0b5464c8c1ca58bbbf'.
[09:20:28][Step 2/2]     INFO [12/14/17 1:20:28:59] Trying to find direct branches.
[09:20:28][Step 2/2]     INFO [12/14/17 1:20:28:59] No direct branches found, searching through tracked branches.
[09:20:28][Step 2/2]     INFO [12/14/17 1:20:28:59] Searching for commits reachable from 'origin/master'.
[09:20:28][Step 2/2]     INFO [12/14/17 1:20:28:60] The branch 'origin/master' has no matching commits.
[09:20:28][Step 2/2]     INFO [12/14/17 1:20:28:60] Searching for commits reachable from 'master'.
[09:20:28][Step 2/2]     INFO [12/14/17 1:20:28:60] The branch 'master' has no matching commits.
[09:20:28][Step 2/2]   INFO [12/14/17 1:20:28:60] End: Getting branches containing the commit 'a10d86fbff08c87eac18aa0b5464c8c1ca58bbbf'. (Took: 13.49ms)
[09:20:28][Step 2/2]   INFO [12/14/17 1:20:28:61] Found possible parent branches: origin/master, master
[09:20:28][Step 2/2]   WARN [12/14/17 1:20:28:61] Failed to inherit Increment branch configuration, ended up with: origin/master, master
[09:20:28][Step 2/2] 
[09:20:28][Step 2/2] Falling back to origin/master branch config
[09:20:28][Step 2/2] INFO [12/14/17 1:20:28:61] End: Attempting to inherit branch configuration from parent branch (Took: 60.29ms)

[JakeGinnivan]

Also, i had next-version set to 1.0.0 and the build version was 2.0.0.. Something odd going on

[asbjornu]

Won't #1243/#1244 solve this or at least make it much easier to solve?

[stale]

This issue has been automatically marked as stale because it has not had recent activity. After 30 days from now, it will be closed if no further activity occurs. Thank you for your contributions.