Repository navigation
Bump develop when release branch created - #832
JakeGinnivan merged 9 commits into
Conversation
JakeGinnivan
commented
Apr 16, 2016
JakeGinnivan
commented
- Fixed an commit counting bug
- Based on discussion at alpha.branchname, beta, rc tags instead of branchname, unstable, beta? #632
- Fixes Increment "develop" version when branching release #695
- Updated related docs
e95b565 to
22741e9
Compare
| } | ||
|
|
||
| public bool IsCurrentBranchDevelop { get; private set; } | ||
| public bool IsCurrentBranchRelease { get; private set; } |
There was a problem hiding this comment.
@JakeGinnivan very small point, but can we get a space between the properties?
|
@JakeGinnivan apart from one small comment, this looks good to me. 👍 |
|
I think this looks good! Rebase, let Travis and AppVeyor do their thing and if all green; merge? |
|
When will this be merged? I could really use this. |
|
This is a bit of a change of behaviour. What does everyone think, changing defaults ok for a minor release? develop is going from unstable to alpha with this change |
|
Since people can always configure |
|
I need to see the impacts. It changes sorting and bumping rules. Changing back to unstable will cause more problems I think. I think the sorting is the same, or better in most cases once this is merged. Spose we can release as a pre-release and gather feedback. |
a87a41b to
786b3cf
Compare
4665a5f to
be15618
Compare
be15618 to
3d7db4b
Compare
- Fixed an commit counting bug - Based on discussion at GitTools#632 - Fixes GitTools#695 - Updated related docs
This removes the need for the TrackMergeTargetBaseVersionStrategy
…e branch commit counts are reset incorrectly)
…d +semver: breaking
3d7db4b to
d193ec4
Compare
|
@asbjornu have updated some of the images in the docs. Will do the mainline docs update in that branch |
|
This shows the real effect of this branch quite well.
|
|
@JakeGinnivan That picture makes perfect sense. LGTM! 😄 👍 |
|
@JakeGinnivan One small thing I noticed: In docs/git-branching-strategies/img/39f9d8b8b007c82f1f80_major-release.png (also shown above), the effect of tagging the master branch is not shown anymore. |
|
Nice catch @DanielRose, R#s test runner truncates output now and I didn't look properly :P |
|
Have fixed that image in #950. Thanks @DanielRose |
4 participants
