Skip to content

Wrong version being calculated for feature branch #788

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Closed
pvandervelde opened this issue Feb 17, 2016 · 9 comments
Closed

Wrong version being calculated for feature branch #788

pvandervelde opened this issue Feb 17, 2016 · 9 comments

Comments

@pvandervelde
Copy link

State of repository

  • Using gitflow, mostly by using the gitflow options in sourcetree
  • Last release: 1.1.0.
  • Master is tagged: 1.1.0
  • Last release was done from a release branch, which was branched of develop, no changes were made to the release branch and then the release branch was merged into master as in the image

sourcetreehistory

Now I'm trying to build on a feature branch and I get the following result

{
  "Major":1,
  "Minor":1,
  "Patch":"0",
  "PreReleaseTag":"packagesfromdev.1",
  "PreReleaseTagWithDash":"-packagesfromdev.1",
  "BuildMetaData":9,
  "BuildMetaDataPadded":"0009",
  "FullBuildMetaData":"9.Branch.feature/packagesfromdev.Sha.ebc8b246196d1f353eadf0322920d44c8f862e16",
  "MajorMinorPatch":"1.1.0",
  "SemVer":"1.1.0-packagesfromdev.1",
  "LegacySemVer":"1.1.0-packagesfromdev1",
  "LegacySemVerPadded":"1.1.0-packagesfromdev0001",
  "AssemblySemVer":"1.1.0.0",
  "FullSemVer":"1.1.0-packagesfromdev.1+9",
  "InformationalVersion":"1.1.0-packagesfromdev.1+9.Branch.feature/packagesfromdev.Sha.ebc8b246196d1f353eadf0322920d44c8f862e16",
  "BranchName":"feature/packagesfromdev",
  "Sha":"ebc8b246196d1f353eadf0322920d44c8f862e16",
  "NuGetVersionV2":"1.1.0-packagesfromdev0001",
  "NuGetVersion":"1.1.0-packagesfromdev0001",
  "CommitDate":"2016-02-17"
}

The log file looks like:

2016-02-18 11:20:22     INFO [02/18/16 11:20:21:81] Working directory: C:\vcs\git\devinfrastructure\Tools-Build
2016-02-18 11:20:22     INFO [02/18/16 11:20:22:27] Project root is: C:\vcs\git\devinfrastructure\Tools-Build
2016-02-18 11:20:22     INFO [02/18/16 11:20:22:39] Using latest commit on specified branch
2016-02-18 11:20:22     INFO [02/18/16 11:20:22:47] Begin: Attempting to inherit branch configuration from parent branch
2016-02-18 11:20:22       INFO [02/18/16 11:20:22:52] Begin: Finding branch source
2016-02-18 11:20:22       INFO [02/18/16 11:20:22:80] End: Finding branch source (Took: 274.02ms)
2016-02-18 11:20:22       INFO [02/18/16 11:20:22:82] Found possible parent branches: develop
2016-02-18 11:20:22     INFO [02/18/16 11:20:22:82] End: Attempting to inherit branch configuration from parent branch (Took: 354.02ms)
2016-02-18 11:20:23     INFO [02/18/16 11:20:23:25] Running against branch: feature/packagesfromdev (ebc8b246196d1f353eadf0322920d44c8f862e16)
2016-02-18 11:20:23     INFO [02/18/16 11:20:23:28] Begin: Calculating base versions
2016-02-18 11:20:23       INFO [02/18/16 11:20:23:38] Fallback base version: 0.1.0 with commit count source 46d14b38338b249323f4251c142c9e0b1f5da84b
2016-02-18 11:20:23       INFO [02/18/16 11:20:23:89] Git tag '1.0.0': 1.0.0 with commit count source 88f1d1fd3e59060205c9fe6cecf0416dc7acfce5
2016-02-18 11:20:23       INFO [02/18/16 11:20:23:91] Git tag '0.6.15': 0.6.15 with commit count source 647b89260562684496d6eae79c9aeaa0a27f9815
2016-02-18 11:20:23       INFO [02/18/16 11:20:23:92] Git tag '0.6.14': 0.6.14 with commit count source fe87115bb0067cd617ea6f34464fecb6a1b07068
2016-02-18 11:20:23       INFO [02/18/16 11:20:23:94] Git tag '0.6.13': 0.6.13 with commit count source 5d0222f3ee19b76fdaef642030d9aebba3d981db
2016-02-18 11:20:23       INFO [02/18/16 11:20:23:97] Git tag '0.6.12': 0.6.12 with commit count source f34f23a7d18faba3acd8f861a1c27937bdf97723
2016-02-18 11:20:24       INFO [02/18/16 11:20:24:00] Git tag '0.6.11': 0.6.11 with commit count source 768d8bcab5a56b1c9ba9f5993e3cc7e5352153bd
2016-02-18 11:20:24       INFO [02/18/16 11:20:24:03] Git tag '0.6.10': 0.6.10 with commit count source e499aa6233accd42f7829f5ecae5a902cff6120c
2016-02-18 11:20:24       INFO [02/18/16 11:20:24:06] Git tag '0.6.9': 0.6.9 with commit count source 77a968ed7b5041dc9937cefb4088d060999d96ef
2016-02-18 11:20:24       INFO [02/18/16 11:20:24:10] Git tag '0.6.8': 0.6.8 with commit count source b37130b2c2e15c01e6a3de41572aa185e14b74e1
2016-02-18 11:20:24       INFO [02/18/16 11:20:24:13] Git tag '0.6.7': 0.6.7 with commit count source 6202768624836f603df079d6a3126e070b651ba4
2016-02-18 11:20:24       INFO [02/18/16 11:20:24:16] Git tag '0.6.6': 0.6.6 with commit count source c092abfd034c9514360096506bba94d9a69ae73f
2016-02-18 11:20:24       INFO [02/18/16 11:20:24:19] Git tag '0.6.5': 0.6.5 with commit count source 07b43c4c6ed1aba8af60b676a47730426714bd90
2016-02-18 11:20:24       INFO [02/18/16 11:20:24:23] Git tag '0.6.4': 0.6.4 with commit count source 282ead6e4bac285ef2fb9f207a29620dab3e8080
2016-02-18 11:20:24       INFO [02/18/16 11:20:24:26] Git tag '0.6.3': 0.6.3 with commit count source 1afe9283048357b4543f9a14d8af86adcf1d82b4
2016-02-18 11:20:24       INFO [02/18/16 11:20:24:30] Git tag '0.6.2': 0.6.2 with commit count source 4dc235a3b8c693027ad5f5658736141c99373777
2016-02-18 11:20:24       INFO [02/18/16 11:20:24:33] Git tag '0.6.1': 0.6.1 with commit count source ad67803516b6b04f7c9161b9e0f7df0b3794e73e
2016-02-18 11:20:24       INFO [02/18/16 11:20:24:37] Git tag '0.6.0': 0.6.0 with commit count source 08455a894df25b8b7bc3f4c74276cd2e2485d160
2016-02-18 11:20:24       INFO [02/18/16 11:20:24:40] Git tag '0.5.15': 0.5.15 with commit count source 2131b2a85c2ff17a57882518fa9b756891eb066b
2016-02-18 11:20:24       INFO [02/18/16 11:20:24:45] Git tag '0.5.14': 0.5.14 with commit count source 70565edcc51d31af57dad32e6ff462deaec50df8
2016-02-18 11:20:24       INFO [02/18/16 11:20:24:50] Git tag '0.5.13': 0.5.13 with commit count source 2f2e7b3a724151f8059b6bacbb543b81fd7fb66c
2016-02-18 11:20:24       INFO [02/18/16 11:20:24:55] Git tag '0.5.12': 0.5.12 with commit count source aa0dde648f3fe848091df67d2f60135092c7b280
2016-02-18 11:20:24       INFO [02/18/16 11:20:24:60] Git tag '0.5.11': 0.5.11 with commit count source a5888499d7ec6db50a4b13f7878256b20c8ca109
2016-02-18 11:20:24       INFO [02/18/16 11:20:24:64] Git tag '0.5.10': 0.5.10 with commit count source c8f1ad8ced025ca2cf618a33a639a971078a9a96
2016-02-18 11:20:24       INFO [02/18/16 11:20:24:70] Git tag '0.5.9': 0.5.9 with commit count source 2aab6db85591775f73c298f8de6fbb34ee2c0ac5
2016-02-18 11:20:24       INFO [02/18/16 11:20:24:76] Git tag '0.5.8': 0.5.8 with commit count source 43c7322ca0e2657316ca4c5da1d2fa7950e1055a
2016-02-18 11:20:24       INFO [02/18/16 11:20:24:82] Git tag '0.5.7': 0.5.7 with commit count source ade7e44889f6e30aeb66292511a7ef88393a4a6f
2016-02-18 11:20:24       INFO [02/18/16 11:20:24:86] Git tag '0.5.6': 0.5.6 with commit count source 4e4d4ab343af9a80acea4ef3b7c78a32cf8a71d3
2016-02-18 11:20:24       INFO [02/18/16 11:20:24:91] Git tag '0.5.5': 0.5.5 with commit count source c4b76b8c88ac24673452f23ff10baa1ed37409e6
2016-02-18 11:20:24       INFO [02/18/16 11:20:24:95] Git tag '0.5.4': 0.5.4 with commit count source f1ac4faf1fd94026121be976495723134fa8b6a2
2016-02-18 11:20:24       INFO [02/18/16 11:20:24:99] Git tag '0.5.3': 0.5.3 with commit count source db30d9af624d0df40bf8ece5517a0b9879ebba02
2016-02-18 11:20:25       INFO [02/18/16 11:20:25:05] Git tag '0.5.2': 0.5.2 with commit count source 4cb62324c1d731693b2965266f90f761cf8c6fa3
2016-02-18 11:20:25       INFO [02/18/16 11:20:25:10] Git tag '0.5.1': 0.5.1 with commit count source d92a00852234147d9e61fb0d10fe586dc11557ad
2016-02-18 11:20:25       INFO [02/18/16 11:20:25:15] Git tag '0.5.0': 0.5.0 with commit count source 40403cd7514a1e3c56086a1fb9b8e916db3ab01a
2016-02-18 11:20:25       INFO [02/18/16 11:20:25:19] Git tag '0.4.1': 0.4.1 with commit count source 029cb2cc7d6f3fceef6b18eba663f8234cc64819
2016-02-18 11:20:25       INFO [02/18/16 11:20:25:24] Git tag '0.4.0': 0.4.0 with commit count source 94a58b40c052c08cf07434b4ed320c5e465b4408
2016-02-18 11:20:25       INFO [02/18/16 11:20:25:29] Git tag '0.3.14': 0.3.14 with commit count source 59eb439dcef3e22db27bd31e28098cc6a735b2d2
2016-02-18 11:20:25       INFO [02/18/16 11:20:25:36] Git tag '0.3.13': 0.3.13 with commit count source 0a450dfdb776e6d9f859c98d90b7088f61f5bf48
2016-02-18 11:20:25       INFO [02/18/16 11:20:25:42] Git tag '0.3.12': 0.3.12 with commit count source 974e077b4a3ae41482adefdb89c492ce75049c8f
2016-02-18 11:20:25       INFO [02/18/16 11:20:25:48] Git tag '0.3.11': 0.3.11 with commit count source 3f5d4ecaf53fb13c59d079b5ce4f5e967b46610f
2016-02-18 11:20:25       INFO [02/18/16 11:20:25:53] Git tag '0.3.10': 0.3.10 with commit count source ff1d3635cfba12fc783f4028dfb1a47026a54fd8
2016-02-18 11:20:25       INFO [02/18/16 11:20:25:59] Git tag '0.3.9': 0.3.9 with commit count source e770ec55f4fabc2378d3babf14fded3dae9aee67
2016-02-18 11:20:25       INFO [02/18/16 11:20:25:65] Git tag '0.3.8': 0.3.8 with commit count source 40883bdc7931070454a71c767a0b9c52fa66ded2
2016-02-18 11:20:25       INFO [02/18/16 11:20:25:72] Git tag '0.3.7': 0.3.7 with commit count source 916f670f769778c95e2e49c665ace40483fa4b03
2016-02-18 11:20:25       INFO [02/18/16 11:20:25:87] Git tag '0.3.6': 0.3.6 with commit count source aa0350c190b63772eea4088378ac34e9f82f81a8
2016-02-18 11:20:25       INFO [02/18/16 11:20:25:97] Git tag '0.3.5': 0.3.5 with commit count source c427eb80d8915234ec5857a2cbb96351676e199a
2016-02-18 11:20:26       INFO [02/18/16 11:20:26:05] Git tag '0.3.4': 0.3.4 with commit count source 15fb6f8eabcdb73455586350183ccb938dbe0790
2016-02-18 11:20:26       INFO [02/18/16 11:20:26:13] Git tag '0.3.3': 0.3.3 with commit count source eea53dd6747d0f2cf25eb6e5745edb4872dc5104
2016-02-18 11:20:26       INFO [02/18/16 11:20:26:20] Git tag '0.3.2': 0.3.2 with commit count source 6ec725295a9f4c993dab2ab61c1a2250d00838e6
2016-02-18 11:20:26       INFO [02/18/16 11:20:26:28] Git tag '0.3.1': 0.3.1 with commit count source 7a41c154c2b71f49550df35c22eef7f5f6dae9f6
2016-02-18 11:20:26       INFO [02/18/16 11:20:26:35] Git tag '0.3.0': 0.3.0 with commit count source 1d9d04d16a8204092298ea7b34b88149073dfc04
2016-02-18 11:20:26       INFO [02/18/16 11:20:26:43] Git tag '0.2.5': 0.2.5 with commit count source 7ee3e72f59189b22245028378492f66c222514ba
2016-02-18 11:20:26       INFO [02/18/16 11:20:26:53] Git tag '0.2.4': 0.2.4 with commit count source e398d59b7ed6e1f6f1e7f1073dbde7e4f7703441
2016-02-18 11:20:26       INFO [02/18/16 11:20:26:61] Git tag '0.2.3': 0.2.3 with commit count source e83e9414024c6f8468d6e93400bb12d465401d45
2016-02-18 11:20:26       INFO [02/18/16 11:20:26:71] Git tag '0.2.2': 0.2.2 with commit count source 7b69041c52d53135bbb777cfae51d91e602a5e39
2016-02-18 11:20:26       INFO [02/18/16 11:20:26:78] Git tag '0.2.1': 0.2.1 with commit count source 785baa6af53e29443a035732657b8ded2f249a48
2016-02-18 11:20:26       INFO [02/18/16 11:20:26:84] Git tag '0.2.0': 0.2.0 with commit count source c24e2fa7805cba0e32bfe5859ab0c6b35990dd91
2016-02-18 11:20:26       INFO [02/18/16 11:20:26:90] Git tag '0.1.9': 0.1.9 with commit count source d8813b0234230ed19f7bfb41f2b71bf17200a22a
2016-02-18 11:20:26       INFO [02/18/16 11:20:26:98] Git tag '0.1.8': 0.1.8 with commit count source 1ce4b08aaabf83390950084bd8b43ae7c88e7b3e
2016-02-18 11:20:27       INFO [02/18/16 11:20:27:05] Git tag '0.1.7': 0.1.7 with commit count source 6162df521b9d286768d85555679eea12cfccfcd1
2016-02-18 11:20:27       INFO [02/18/16 11:20:27:12] Git tag '0.1.6': 0.1.6 with commit count source 06c3f407a228d420faf779d3b482feaf27acbaed
2016-02-18 11:20:27       INFO [02/18/16 11:20:27:19] Git tag '0.1.5': 0.1.5 with commit count source 9ccf2334b7528e68a9a69ce6aa49e485c49bc19d
2016-02-18 11:20:27       INFO [02/18/16 11:20:27:26] Git tag '0.1.4': 0.1.4 with commit count source 8c3c22d21d8cbb343f36e3dab5a53d08905e08e2
2016-02-18 11:20:27       INFO [02/18/16 11:20:27:33] Git tag '0.1.3': 0.1.3 with commit count source f492c8539652cc4d045bf95c03d4f0b8ff0e01b7
2016-02-18 11:20:27       INFO [02/18/16 11:20:27:40] Git tag '0.1.2': 0.1.2 with commit count source 0a248afafaff35036fc59cf5736abac32cb8e058
2016-02-18 11:20:27       INFO [02/18/16 11:20:27:48] Git tag '0.1.1': 0.1.1 with commit count source 5b3c635e73bce7d333e8f1e8a41627225d3d2576
2016-02-18 11:20:27       INFO [02/18/16 11:20:27:57] Git tag '0.1': 0.1.0 with commit count source 3dc7e9434039349ba2c7ae4aa906a0393904d291
2016-02-18 11:20:27       INFO [02/18/16 11:20:27:65] Git tag '0.0.1': 0.0.1 with commit count source 063a037b71c811405b632b5c993b5e58ff290cb3
2016-02-18 11:20:28       INFO [02/18/16 11:20:28:01] Merge message 'Merge branch 'hotfix/1.0.1' into develop': 1.0.1 with commit count source 701bbcb619fb88a40eff7bcae221b72f435fc380
2016-02-18 11:20:28       INFO [02/18/16 11:20:28:09] Merge message 'Merge branch 'release/1.0.0' into develop': 1.0.0 with commit count source 6be9c15a54dfd9535edf21828a17a5617699fb62
2016-02-18 11:20:28       INFO [02/18/16 11:20:28:11] Merge message 'Merge branch 'release/1.0.0'': 1.0.0 with commit count source 88f1d1fd3e59060205c9fe6cecf0416dc7acfce5
2016-02-18 11:20:28       INFO [02/18/16 11:20:28:12] Merge message 'Merge branch 'hotfix/0.6.15'': 0.6.15 with commit count source 647b89260562684496d6eae79c9aeaa0a27f9815
2016-02-18 11:20:28       INFO [02/18/16 11:20:28:15] Merge message 'Merge branch 'hotfix/0.6.15' into develop': 0.6.15 with commit count source 2fc7f8b2130f0269efcebc13f21d31db9896ec02
2016-02-18 11:20:28       INFO [02/18/16 11:20:28:16] Merge message 'Merge branch 'release/0.6.14' into develop': 0.6.14 with commit count source 7b1c962667e82f9318dab00d73955fc3bfddce57
2016-02-18 11:20:28       INFO [02/18/16 11:20:28:19] Merge message 'Merge branch 'release/0.6.14'': 0.6.14 with commit count source fe87115bb0067cd617ea6f34464fecb6a1b07068
2016-02-18 11:20:28       INFO [02/18/16 11:20:28:21] Merge message 'Merge branch 'hotfix/0.6.13' into develop': 0.6.13 with commit count source 19e72235041976390674bfe38e57a18105e54f92
2016-02-18 11:20:28       INFO [02/18/16 11:20:28:23] Merge message 'Merge branch 'hotfix/0.6.13'': 0.6.13 with commit count source 5d0222f3ee19b76fdaef642030d9aebba3d981db
2016-02-18 11:20:28       INFO [02/18/16 11:20:28:27] Merge message 'Merge branch 'hotfix/0.6.12' into develop': 0.6.12 with commit count source e0444c83c5468d8dc1e34c510a0ae35eb8e933ab
2016-02-18 11:20:28       INFO [02/18/16 11:20:28:29] Merge message 'Merge branch 'hotfix/0.6.12'': 0.6.12 with commit count source f34f23a7d18faba3acd8f861a1c27937bdf97723
2016-02-18 11:20:28       INFO [02/18/16 11:20:28:33] Merge message 'Merge branch 'hotfix/0.6.11'': 0.6.11 with commit count source 768d8bcab5a56b1c9ba9f5993e3cc7e5352153bd
2016-02-18 11:20:28       INFO [02/18/16 11:20:28:37] Merge message 'Merge branch 'hotfix/0.6.11' into develop': 0.6.11 with commit count source 5e9a5b39326acf2c2d68a551df465fa3f98e22e9
2016-02-18 11:20:28       INFO [02/18/16 11:20:28:40] Merge message 'Merge branch 'hotfix/0.6.10' into develop': 0.6.10 with commit count source d083220ae85e52fbb0660e5c1efb86d1504abdde
2016-02-18 11:20:28       INFO [02/18/16 11:20:28:43] Merge message 'Merge branch 'hotfix/0.6.10'': 0.6.10 with commit count source e499aa6233accd42f7829f5ecae5a902cff6120c
2016-02-18 11:20:28       INFO [02/18/16 11:20:28:47] Merge message 'Merge branch 'hotfix/0.6.9'': 0.6.9 with commit count source 77a968ed7b5041dc9937cefb4088d060999d96ef
2016-02-18 11:20:28       INFO [02/18/16 11:20:28:51] Merge message 'Merge branch 'hotfix/0.6.9' into develop': 0.6.9 with commit count source 826ced478a783c5c1837bfb4cf7fdda53065cb5b
2016-02-18 11:20:28       INFO [02/18/16 11:20:28:54] Merge message 'Merge branch 'hotfix/0.6.8' into develop': 0.6.8 with commit count source 6276c0f34517097c1abdeca1a4a1e49e39cf82ec
2016-02-18 11:20:28       INFO [02/18/16 11:20:28:57] Merge message 'Merge branch 'hotfix/0.6.8'': 0.6.8 with commit count source b37130b2c2e15c01e6a3de41572aa185e14b74e1
2016-02-18 11:20:28       INFO [02/18/16 11:20:28:62] Merge message 'Merge branch 'hotfix/0.6.7' into develop': 0.6.7 with commit count source a9acd5ac4e5df1d903e5a3e9b1288b9fa973377b
2016-02-18 11:20:28       INFO [02/18/16 11:20:28:65] Merge message 'Merge branch 'hotfix/0.6.7'': 0.6.7 with commit count source 6202768624836f603df079d6a3126e070b651ba4
2016-02-18 11:20:28       INFO [02/18/16 11:20:28:70] Merge message 'Merge branch 'hotfix/0.6.6'': 0.6.6 with commit count source c092abfd034c9514360096506bba94d9a69ae73f
2016-02-18 11:20:28       INFO [02/18/16 11:20:28:75] Merge message 'Merge branch 'hotfix/0.6.6' into develop': 0.6.6 with commit count source 38cd374c9290072e794864eb24eca048514fd953
2016-02-18 11:20:28       INFO [02/18/16 11:20:28:78] Merge message 'Merge branch 'hotfix/0.6.5' into develop': 0.6.5 with commit count source 59aea3dc21f7e840f4eb15d47403919860d74b29
2016-02-18 11:20:28       INFO [02/18/16 11:20:28:81] Merge message 'Merge branch 'hotfix/0.6.5'': 0.6.5 with commit count source 07b43c4c6ed1aba8af60b676a47730426714bd90
2016-02-18 11:20:28       INFO [02/18/16 11:20:28:85] Merge message 'Merge branch 'hotfix/0.6.4' into develop': 0.6.4 with commit count source b9860dcbd2f9ad7a5a18004dfc41276c10d3f8f3
2016-02-18 11:20:28       INFO [02/18/16 11:20:28:89] Merge message 'Merge branch 'hotfix/0.6.4'': 0.6.4 with commit count source 282ead6e4bac285ef2fb9f207a29620dab3e8080
2016-02-18 11:20:28       INFO [02/18/16 11:20:28:94] Merge message 'Merge branch 'hotfix/0.6.3'': 0.6.3 with commit count source 1afe9283048357b4543f9a14d8af86adcf1d82b4
2016-02-18 11:20:28       INFO [02/18/16 11:20:28:98] Merge message 'Merge branch 'hotfix/0.6.3' into develop': 0.6.3 with commit count source 9a83dbef70ada75d7d605c59ee5159554ee93007
2016-02-18 11:20:29       INFO [02/18/16 11:20:29:02] Merge message 'Merge branch 'hotfix/0.6.2' into develop': 0.6.2 with commit count source 34695b151bdb1548f85e106fbcc8e3dbe38bada9
2016-02-18 11:20:29       INFO [02/18/16 11:20:29:05] Merge message 'Merge branch 'hotfix/0.6.2'': 0.6.2 with commit count source 4dc235a3b8c693027ad5f5658736141c99373777
2016-02-18 11:20:29       INFO [02/18/16 11:20:29:10] Merge message 'Merge branch 'hotfix/0.6.1' into develop': 0.6.1 with commit count source 43ffa439257cfc9b4a536320c1d4f871fc69de34
2016-02-18 11:20:29       INFO [02/18/16 11:20:29:13] Merge message 'Merge branch 'hotfix/0.6.1'': 0.6.1 with commit count source ad67803516b6b04f7c9161b9e0f7df0b3794e73e
2016-02-18 11:20:29       INFO [02/18/16 11:20:29:18] Merge message 'Merge branch 'release/0.6.0' into develop': 0.6.0 with commit count source 64c635e738ae90f7acccd2a23e8ce8d6b8321f6b
2016-02-18 11:20:29       INFO [02/18/16 11:20:29:22] Merge message 'Merge branch 'release/0.6.0'': 0.6.0 with commit count source 08455a894df25b8b7bc3f4c74276cd2e2485d160
2016-02-18 11:20:29       INFO [02/18/16 11:20:29:26] Merge message 'Merge branch 'hotfix/0.5.15' into develop': 0.5.15 with commit count source 8f98dcb41bdbe88aab39098e88014d4ba53a38c4
2016-02-18 11:20:29       INFO [02/18/16 11:20:29:31] Merge message 'Merge branch 'hotfix/0.5.15'': 0.5.15 with commit count source 2131b2a85c2ff17a57882518fa9b756891eb066b
2016-02-18 11:20:29       INFO [02/18/16 11:20:29:35] Merge message 'Merge branch 'hotfix/0.5.14' into develop': 0.5.14 with commit count source 1346219e2ed4a54d5ba607791363e5f9483f4d3c
2016-02-18 11:20:29       INFO [02/18/16 11:20:29:40] Merge message 'Merge branch 'hotfix/0.5.14'': 0.5.14 with commit count source 70565edcc51d31af57dad32e6ff462deaec50df8
2016-02-18 11:20:29       INFO [02/18/16 11:20:29:44] Merge message 'Merge branch 'hotfix/0.5.13' into develop': 0.5.13 with commit count source 4190350643b3e448a6a796a7dc1041628c2edddb
2016-02-18 11:20:29       INFO [02/18/16 11:20:29:48] Merge message 'Merge branch 'hotfix/0.5.13'': 0.5.13 with commit count source 2f2e7b3a724151f8059b6bacbb543b81fd7fb66c
2016-02-18 11:20:29       INFO [02/18/16 11:20:29:53] Merge message 'Merge branch 'hotfix/0.5.12'': 0.5.12 with commit count source aa0dde648f3fe848091df67d2f60135092c7b280
2016-02-18 11:20:29       INFO [02/18/16 11:20:29:57] Merge message 'Merge branch 'hotfix/0.5.12' into develop': 0.5.12 with commit count source e3ce02a12fccf943854042cceace91efd4eadb96
2016-02-18 11:20:29       INFO [02/18/16 11:20:29:61] Merge message 'Merge branch 'hotfix/0.5.11' into develop': 0.5.11 with commit count source 333d8f3417f915063c999ce3f5f80d63473a4b33
2016-02-18 11:20:29       INFO [02/18/16 11:20:29:66] Merge message 'Merge branch 'hotfix/0.5.11'': 0.5.11 with commit count source a5888499d7ec6db50a4b13f7878256b20c8ca109
2016-02-18 11:20:29       INFO [02/18/16 11:20:29:72] Merge message 'Merge branch 'hotfix/0.5.10' into develop': 0.5.10 with commit count source 71d9f7b295998980764a16c803ab2fb192121d5a
2016-02-18 11:20:29       INFO [02/18/16 11:20:29:76] Merge message 'Merge branch 'hotfix/0.5.10'': 0.5.10 with commit count source c8f1ad8ced025ca2cf618a33a639a971078a9a96
2016-02-18 11:20:29       INFO [02/18/16 11:20:29:81] Merge message 'Merge branch 'hotfix/0.5.9' into develop': 0.5.9 with commit count source 21f43dd9fd83f3ffb49cbc033c30d02c090b3af4
2016-02-18 11:20:29       INFO [02/18/16 11:20:29:85] Merge message 'Merge branch 'hotfix/0.5.9'': 0.5.9 with commit count source 2aab6db85591775f73c298f8de6fbb34ee2c0ac5
2016-02-18 11:20:29       INFO [02/18/16 11:20:29:90] Merge message 'Merge branch 'hotfix/0.5.8' into develop': 0.5.8 with commit count source 41e560a5dddcc092e086dbc39b1146235d24d1d6
2016-02-18 11:20:29       INFO [02/18/16 11:20:29:94] Merge message 'Merge branch 'hotfix/0.5.8'': 0.5.8 with commit count source 43c7322ca0e2657316ca4c5da1d2fa7950e1055a
2016-02-18 11:20:29       INFO [02/18/16 11:20:29:99] Merge message 'Merge branch 'hotfix/0.5.7' into develop': 0.5.7 with commit count source 22ff08bbdbda8486e77d0d0bae8b74a6bc793d0c
2016-02-18 11:20:30       INFO [02/18/16 11:20:30:03] Merge message 'Merge branch 'hotfix/0.5.7'': 0.5.7 with commit count source ade7e44889f6e30aeb66292511a7ef88393a4a6f
2016-02-18 11:20:30       INFO [02/18/16 11:20:30:07] Merge message 'Merge branch 'hotfix/0.5.6' into develop': 0.5.6 with commit count source f08bec138631594c722e04dfca0d28f9675658bf
2016-02-18 11:20:30       INFO [02/18/16 11:20:30:12] Merge message 'Merge branch 'hotfix/0.5.6'': 0.5.6 with commit count source 4e4d4ab343af9a80acea4ef3b7c78a32cf8a71d3
2016-02-18 11:20:30       INFO [02/18/16 11:20:30:16] Merge message 'Merge branch 'hotfix/0.5.5' into develop': 0.5.5 with commit count source 6c3add6a5f62ae76b7850007f63e0603b9eee60e
2016-02-18 11:20:30       INFO [02/18/16 11:20:30:21] Merge message 'Merge branch 'hotfix/0.5.5'': 0.5.5 with commit count source c4b76b8c88ac24673452f23ff10baa1ed37409e6
2016-02-18 11:20:30       INFO [02/18/16 11:20:30:25] Merge message 'Merge branch 'hotfix/0.5.4' into develop': 0.5.4 with commit count source 3540577b1e0b903ace31f58b84f270c0ef797c8d
2016-02-18 11:20:30       INFO [02/18/16 11:20:30:29] Merge message 'Merge branch 'hotfix/0.5.4'': 0.5.4 with commit count source f1ac4faf1fd94026121be976495723134fa8b6a2
2016-02-18 11:20:30       INFO [02/18/16 11:20:30:34] Merge message 'Merge branch 'hotfix/0.5.3' into develop': 0.5.3 with commit count source 4632cd0e5e92c7f02a1b791db548b933f2a569be
2016-02-18 11:20:30       INFO [02/18/16 11:20:30:39] Merge message 'Merge branch 'hotfix/0.5.3'': 0.5.3 with commit count source db30d9af624d0df40bf8ece5517a0b9879ebba02
2016-02-18 11:20:30       INFO [02/18/16 11:20:30:44] Merge message 'Merge branch 'hotfix/0.5.2' into develop': 0.5.2 with commit count source a18d01ecebca55f334c9cf5973c4aedd2f79d097
2016-02-18 11:20:30       INFO [02/18/16 11:20:30:49] Merge message 'Merge branch 'hotfix/0.5.2'': 0.5.2 with commit count source 4cb62324c1d731693b2965266f90f761cf8c6fa3
2016-02-18 11:20:30       INFO [02/18/16 11:20:30:53] Merge message 'Merge branch 'hotfix/0.5.1'': 0.5.1 with commit count source d92a00852234147d9e61fb0d10fe586dc11557ad
2016-02-18 11:20:30       INFO [02/18/16 11:20:30:57] Merge message 'Merge branch 'hotfix/0.5.1' into develop': 0.5.1 with commit count source 48e2ccfaffba6ea4ad9c59840ee48a142023581e
2016-02-18 11:20:30       INFO [02/18/16 11:20:30:62] Merge message 'Merge branch 'release/0.5.0'': 0.5.0 with commit count source 40403cd7514a1e3c56086a1fb9b8e916db3ab01a
2016-02-18 11:20:30       INFO [02/18/16 11:20:30:67] Merge message 'Merge branch 'hotfix/0.4.1'': 0.4.1 with commit count source 029cb2cc7d6f3fceef6b18eba663f8234cc64819
2016-02-18 11:20:30       INFO [02/18/16 11:20:30:73] Merge message 'Merge branch 'hotfix/0.4.1' into develop': 0.4.1 with commit count source 509b77c60575fdeec01b76a0d3fcd40d302de9ce
2016-02-18 11:20:30       INFO [02/18/16 11:20:30:80] Merge message 'Merge branch 'release/0.4.0'': 0.4.0 with commit count source 94a58b40c052c08cf07434b4ed320c5e465b4408
2016-02-18 11:20:30       INFO [02/18/16 11:20:30:85] Merge message 'Merge branch 'hotfix/0.3.14' into develop': 0.3.14 with commit count source 7d371d3c16806a2764da015ff6c98e29bafe7797
2016-02-18 11:20:30       INFO [02/18/16 11:20:30:90] Merge message 'Merge branch 'hotfix/0.3.14'': 0.3.14 with commit count source 59eb439dcef3e22db27bd31e28098cc6a735b2d2
2016-02-18 11:20:30       INFO [02/18/16 11:20:30:95] Merge message 'Merge branch 'hotfix/0.3.13' into develop': 0.3.13 with commit count source f7f747f127e7551332645d497051a76883e27e94
2016-02-18 11:20:31       INFO [02/18/16 11:20:31:00] Merge message 'Merge branch 'hotfix/0.3.13'': 0.3.13 with commit count source 0a450dfdb776e6d9f859c98d90b7088f61f5bf48
2016-02-18 11:20:31       INFO [02/18/16 11:20:31:06] Merge message 'Merge branch 'hotfix/0.3.12'': 0.3.12 with commit count source 974e077b4a3ae41482adefdb89c492ce75049c8f
2016-02-18 11:20:31       INFO [02/18/16 11:20:31:11] Merge message 'Merge branch 'hotfix/0.3.12' into develop': 0.3.12 with commit count source 0afc6699b02f124edadc31d75d94f41223a9014b
2016-02-18 11:20:31       INFO [02/18/16 11:20:31:17] Merge message 'Merge branch 'hotfix/0.3.11' into develop': 0.3.11 with commit count source 8f9da6a2c15fa63caf9fb67c930fa52eb04e013f
2016-02-18 11:20:31       INFO [02/18/16 11:20:31:22] Merge message 'Merge branch 'hotfix/0.3.11'': 0.3.11 with commit count source 3f5d4ecaf53fb13c59d079b5ce4f5e967b46610f
2016-02-18 11:20:31       INFO [02/18/16 11:20:31:27] Merge message 'Merge branch 'hotfix/0.3.10' into develop': 0.3.10 with commit count source e00e3445408efe98f3bdf89423dec115a68a13a0
2016-02-18 11:20:31       INFO [02/18/16 11:20:31:33] Merge message 'Merge branch 'hotfix/0.3.10'': 0.3.10 with commit count source ff1d3635cfba12fc783f4028dfb1a47026a54fd8
2016-02-18 11:20:31       INFO [02/18/16 11:20:31:40] Merge message 'Merge branch 'hotfix/0.3.9' into develop': 0.3.9 with commit count source e1ea5044e3db19d7178c39ef3d548f8ce363b1fb
2016-02-18 11:20:31       INFO [02/18/16 11:20:31:46] Merge message 'Merge branch 'hotfix/0.3.9'': 0.3.9 with commit count source e770ec55f4fabc2378d3babf14fded3dae9aee67
2016-02-18 11:20:31       INFO [02/18/16 11:20:31:54] Merge message 'Merge branch 'hotfix/0.3.8' into develop': 0.3.8 with commit count source 63e6da4982b73deb8173c67dfbb20c15abf9c343
2016-02-18 11:20:31       INFO [02/18/16 11:20:31:60] Merge message 'Merge branch 'hotfix/0.3.8'': 0.3.8 with commit count source 40883bdc7931070454a71c767a0b9c52fa66ded2
2016-02-18 11:20:31       INFO [02/18/16 11:20:31:68] Merge message 'Merge branch 'hotfix/0.3.7' into develop': 0.3.7 with commit count source 651335b509ba0bebebdba8b5a416f30558e2537d
2016-02-18 11:20:31       INFO [02/18/16 11:20:31:75] Merge message 'Merge branch 'hotfix/0.3.7'': 0.3.7 with commit count source 916f670f769778c95e2e49c665ace40483fa4b03
2016-02-18 11:20:31       INFO [02/18/16 11:20:31:84] Merge message 'Merge branch 'hotfix/0.3.6' into develop': 0.3.6 with commit count source 93f9a48728d1c39e67922f32f456fe373a44832a
2016-02-18 11:20:31       INFO [02/18/16 11:20:31:91] Merge message 'Merge branch 'hotfix/0.3.6'': 0.3.6 with commit count source aa0350c190b63772eea4088378ac34e9f82f81a8
2016-02-18 11:20:31       INFO [02/18/16 11:20:31:97] Merge message 'Merge branch 'hotfix/0.3.5'': 0.3.5 with commit count source c427eb80d8915234ec5857a2cbb96351676e199a
2016-02-18 11:20:32       INFO [02/18/16 11:20:32:03] Merge message 'Merge branch 'hotfix/0.3.5' into develop': 0.3.5 with commit count source 2b4995b4374bb5663a5edbd5f3c0424ed6b95648
2016-02-18 11:20:32       INFO [02/18/16 11:20:32:09] Merge message 'Merge branch 'hotfix/0.3.4' into develop': 0.3.4 with commit count source 51915e0886d1c325e6db885da810a5d7426d4cf4
2016-02-18 11:20:32       INFO [02/18/16 11:20:32:15] Merge message 'Merge branch 'hotfix/0.3.4'': 0.3.4 with commit count source 15fb6f8eabcdb73455586350183ccb938dbe0790
2016-02-18 11:20:32       INFO [02/18/16 11:20:32:21] Merge message 'Merge branch 'hotfix/0.3.3' into develop': 0.3.3 with commit count source 0852f642813c37e31300aec56c3255b26c09385b
2016-02-18 11:20:32       INFO [02/18/16 11:20:32:27] Merge message 'Merge branch 'hotfix/0.3.3'': 0.3.3 with commit count source eea53dd6747d0f2cf25eb6e5745edb4872dc5104
2016-02-18 11:20:32       INFO [02/18/16 11:20:32:33] Merge message 'Merge branch 'hotfix/0.3.2'': 0.3.2 with commit count source 6ec725295a9f4c993dab2ab61c1a2250d00838e6
2016-02-18 11:20:32       INFO [02/18/16 11:20:32:39] Merge message 'Merge branch 'hotfix/0.3.2' into develop': 0.3.2 with commit count source 2cd2b5bec5db20a19a12373aa14b3561bce23cfc
2016-02-18 11:20:32       INFO [02/18/16 11:20:32:45] Merge message 'Merge branch 'hotfix/0.3.1' into develop': 0.3.1 with commit count source bdd71bff736b276b860d5e89db5f2dc1f7bc935d
2016-02-18 11:20:32       INFO [02/18/16 11:20:32:50] Merge message 'Merge branch 'hotfix/0.3.1'': 0.3.1 with commit count source 7a41c154c2b71f49550df35c22eef7f5f6dae9f6
2016-02-18 11:20:32       INFO [02/18/16 11:20:32:56] Merge message 'Merge branch 'release/0.3.0'': 0.3.0 with commit count source 1d9d04d16a8204092298ea7b34b88149073dfc04
2016-02-18 11:20:32       INFO [02/18/16 11:20:32:62] Merge message 'Merge branch 'hotfix/0.2.5' into develop': 0.2.5 with commit count source c008c720bb1975ad017e84ef7548c0cb79d3d0de
2016-02-18 11:20:32       INFO [02/18/16 11:20:32:69] Merge message 'Merge branch 'hotfix/0.2.5'': 0.2.5 with commit count source 7ee3e72f59189b22245028378492f66c222514ba
2016-02-18 11:20:32       INFO [02/18/16 11:20:32:76] Merge message 'Merge branch 'hotfix/0.2.4' into develop': 0.2.4 with commit count source 9e03f79d3a0c95333a8f92dc526fab41ccbbd8b1
2016-02-18 11:20:32       INFO [02/18/16 11:20:32:83] Merge message 'Merge branch 'hotfix/0.2.4'': 0.2.4 with commit count source e398d59b7ed6e1f6f1e7f1073dbde7e4f7703441
2016-02-18 11:20:32       INFO [02/18/16 11:20:32:92] Merge message 'Merge branch 'hotfix/0.2.3' into develop': 0.2.3 with commit count source b07a0bee25c72e3f6b65e02c78d9e2c2bf92a4d0
2016-02-18 11:20:33       INFO [02/18/16 11:20:33:00] Merge message 'Merge branch 'hotfix/0.2.3'': 0.2.3 with commit count source e83e9414024c6f8468d6e93400bb12d465401d45
2016-02-18 11:20:33       INFO [02/18/16 11:20:33:06] Merge message 'Merge branch 'hotfix/0.2.2' into develop': 0.2.2 with commit count source e0ec3c39fcbee12075629be6e2d6b472681822e3
2016-02-18 11:20:33       INFO [02/18/16 11:20:33:12] Merge message 'Merge branch 'hotfix/0.2.2'': 0.2.2 with commit count source 7b69041c52d53135bbb777cfae51d91e602a5e39
2016-02-18 11:20:33       INFO [02/18/16 11:20:33:19] Merge message 'Merge branch 'hotfix/0.2.1' into develop': 0.2.1 with commit count source 9d807cbb010b58eba343c25f47bd9eaddead4054
2016-02-18 11:20:33       INFO [02/18/16 11:20:33:25] Merge message 'Merge branch 'hotfix/0.2.1'': 0.2.1 with commit count source 785baa6af53e29443a035732657b8ded2f249a48
2016-02-18 11:20:33       INFO [02/18/16 11:20:33:32] Merge message 'Merge branch 'release/0.2.0'': 0.2.0 with commit count source c24e2fa7805cba0e32bfe5859ab0c6b35990dd91
2016-02-18 11:20:33       INFO [02/18/16 11:20:33:39] Merge message 'Merge branch 'hotfix/0.1.9' into develop': 0.1.9 with commit count source 7868191ba540b94fbc0480a825a51f52e3aee41d
2016-02-18 11:20:33       INFO [02/18/16 11:20:33:45] Merge message 'Merge branch 'hotfix/0.1.9'': 0.1.9 with commit count source d8813b0234230ed19f7bfb41f2b71bf17200a22a
2016-02-18 11:20:33       INFO [02/18/16 11:20:33:52] Merge message 'Merge branch 'hotfix/0.1.8'': 0.1.8 with commit count source 1ce4b08aaabf83390950084bd8b43ae7c88e7b3e
2016-02-18 11:20:33       INFO [02/18/16 11:20:33:59] Merge message 'Merge branch 'hotfix/0.1.8' into develop': 0.1.8 with commit count source 62a8b3150ea2e690349de69447a4979f82c56169
2016-02-18 11:20:33       INFO [02/18/16 11:20:33:66] Merge message 'Merge branch 'hotfix/0.1.7' into develop': 0.1.7 with commit count source 0396fdae7420ebe2f9975c3c66b8f1ac1c1de1f1
2016-02-18 11:20:33       INFO [02/18/16 11:20:33:74] Merge message 'Merge branch 'hotfix/0.1.7'': 0.1.7 with commit count source 6162df521b9d286768d85555679eea12cfccfcd1
2016-02-18 11:20:33       INFO [02/18/16 11:20:33:83] Merge message 'Merge branch 'hotfix/0.1.6'': 0.1.6 with commit count source 06c3f407a228d420faf779d3b482feaf27acbaed
2016-02-18 11:20:33       INFO [02/18/16 11:20:33:90] Merge message 'Merge branch 'hotfix/0.1.6' into develop': 0.1.6 with commit count source ac4541f0c54468dbbee6244698531920ae422cfe
2016-02-18 11:20:33       INFO [02/18/16 11:20:33:97] Merge message 'Merge branch 'hotfix/0.1.5' into develop': 0.1.5 with commit count source 56c741ced14bb36170da7e4e89f611f5278db249
2016-02-18 11:20:34       INFO [02/18/16 11:20:34:05] Merge message 'Merge branch 'hotfix/0.1.5'': 0.1.5 with commit count source 9ccf2334b7528e68a9a69ce6aa49e485c49bc19d
2016-02-18 11:20:34       INFO [02/18/16 11:20:34:13] Merge message 'Merge branch 'hotfix/0.1.4' into develop': 0.1.4 with commit count source 576b7973d65e56dd44fa3da1979860de2481b256
2016-02-18 11:20:34       INFO [02/18/16 11:20:34:20] Merge message 'Merge branch 'hotfix/0.1.4'': 0.1.4 with commit count source 8c3c22d21d8cbb343f36e3dab5a53d08905e08e2
2016-02-18 11:20:34       INFO [02/18/16 11:20:34:27] Merge message 'Merge branch 'hotfix/0.1.3'': 0.1.3 with commit count source f492c8539652cc4d045bf95c03d4f0b8ff0e01b7
2016-02-18 11:20:34       INFO [02/18/16 11:20:34:33] Merge message 'Merge branch 'hotfix/0.1.3' into develop': 0.1.3 with commit count source 3f721bcd03412cabe25e555d8df8e89a509915ad
2016-02-18 11:20:34       INFO [02/18/16 11:20:34:41] Merge message 'Merge branch 'hotfix/0.1.2' into develop': 0.1.2 with commit count source 0aae90ba94886ad6b5a33832807c15ae26e890c3
2016-02-18 11:20:34       INFO [02/18/16 11:20:34:48] Merge message 'Merge branch 'hotfix/0.1.2'': 0.1.2 with commit count source 0a248afafaff35036fc59cf5736abac32cb8e058
2016-02-18 11:20:34       INFO [02/18/16 11:20:34:55] Merge message 'Merge branch 'hotfix/0.1.1' into develop': 0.1.1 with commit count source 7aa9b9b3180fcbb00e4dc9c7368453e08f57f9c5
2016-02-18 11:20:34       INFO [02/18/16 11:20:34:63] Merge message 'Merge branch 'hotfix/0.1.1'': 0.1.1 with commit count source 5b3c635e73bce7d333e8f1e8a41627225d3d2576
2016-02-18 11:20:34       INFO [02/18/16 11:20:34:72] Merge message 'Merge branch 'release/0.1'': 0.1.0 with commit count source 3dc7e9434039349ba2c7ae4aa906a0393904d291
2016-02-18 11:20:34       INFO [02/18/16 11:20:34:80] Merge message 'Merge branch 'release/0.1' into develop': 0.1.0 with commit count source 0af7e5606af7217fd8b70a2a42a178d562119ebc
2016-02-18 11:20:34       INFO [02/18/16 11:20:34:89] Found multiple base versions which will produce the same SemVer (1.1.0), taking oldest source for commit counting (Git tag '1.0.0')
2016-02-18 11:20:34       INFO [02/18/16 11:20:34:89] Base version used: Merge message 'Merge branch 'release/1.0.0'': 1.0.0 with commit count source 88f1d1fd3e59060205c9fe6cecf0416dc7acfce5
2016-02-18 11:20:34     INFO [02/18/16 11:20:34:89] End: Calculating base versions (Took: 11,614.68ms)
2016-02-18 11:20:34     INFO [02/18/16 11:20:34:91] Using branch name to calculate version tag
2016-02-18 11:20:34     INFO [02/18/16 11:20:34:94] 9 commits found between 88f1d1fd3e59060205c9fe6cecf0416dc7acfce5 and ebc8b246196d1f353eadf0322920d44c8f862e16

And from that it looks like it doesn't find any reference what so ever to 1.1.0.

So now the question is where did I go wrong. I've been using sourcetree and the build in gitflow feature so I don't think I stuffed up the workflow but could have. Any suggestions on why this happened?

Also I'm guessing as soon as I merge this change to develop and then create a release branch it will all sort itself out, but I would like to prevent this issue from happening again.
@pvandervelde
Copy link
Author

Oh this was with Gitversion.commandline 3.1.2 but I just tried with 3.4.1 and it gives the same results.

@JakeGinnivan
Copy link
Contributor

Looks like a scenario our tests don't cover. The way I sort these issues out is I write a test replicating the issue by asserting the versions I would expect.

Then I try and fix it :P A PR with a failing test (or completely fixing the issue) is welcome, but the test is a real time saver when i pick up these sort of issues

@pvandervelde
Copy link
Author

I'll see if I have some time but we're in the middle of TFS upgrades and releases so I'm kinda snowed under at the moment :(

@pvandervelde
Copy link
Author

Am I correct in thinking that my case is nearly the same as described in the NoMergeBacksToDevelopInCaseThereAreNoChangesInReleaseBranch method in https://github.com/GitTools/GitVersion/blob/master/src/GitVersionCore.Tests/IntegrationTests/ReleaseBranchScenarios.cs?

If so I can add create a test with a pull request

@bmmathe
Copy link

bmmathe commented May 21, 2016 •
edited
Loading

I'm having a similar issue using gitflow however I get the message "Merge base was due to a forward merge, moving to next merge base". I'm using SourceTree to manage my feature branches and the problem seems to be caused when we merge a release branch into master without committing a change to the release branch. In this case the gitflow merge only merges the release branch to master and not into develop. When we create a feature branch from develop after this merge the version falls to the version that was last merged into the develop branch from master. However, commits that happen directly on the develop branch do get the correct version number.

image

@pvandervelde
Copy link
Author

Yes I've seen that one same problem as well.

@bmmathe
Copy link

bmmathe commented May 22, 2016

I posted a failed test PR for it.
#872

@bmmathe bmmathe mentioned this issue May 25, 2016
Closed
@JakeGinnivan
Copy link
Contributor

Fixed by #832

@JakeGinnivan
Copy link
Contributor

Thoughts on develop tag changing from unstable to alpha in a minor release. Or do I release this as a 4.0.0-beta?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
3 participants
@pvandervelde @JakeGinnivan @bmmathe