Support merging a release branch back to develop but maintain the version

This is still WIP

We have a situation where stabilizing majors we want to merge a release branch down to develop but then keep working on it. When this is done the versioning resets back to x.y.z-beta.0+1 and ignores any prerelease tags.

I remember talking with @nulltoken about this and we said it wasn't a valid use case. 

@nulltoken can you take a look at this and see if its even possible to support this? (see the failing test)

cc @SimonCropp @johnsimons @JakeGinnivan 
Hmm, I thought only merges back to master would bump? 

But in our case it wouldn't really be an issue if develop jumped to 2.1.0 in this case since that would be the correct next version for develop

Sent from my iPhone

> On 01 Jul 2014, at 19:18, Jake Ginnivan <notifications@github.com> wrote:
> 
> In AcceptanceTests/GitHubFlow/ReleaseBranchTests.cs:
> 
> > +                fixture.Repository.CreateBranch("release-2.0.0");
> > +                fixture.Repository.Checkout("release-2.0.0");
> > +                fixture.Repository.MakeCommits(1);
> > +
> > +                VerifyVersion(fixture, "2.0.0-beta.1+1");
> > +
> > +                //tag it to bump to beta 2
> > +                fixture.Repository.ApplyTag("2.0.0-beta1");
> > +
> > +                fixture.Repository.MakeCommits(1);
> > +
> > +                VerifyVersion(fixture, "2.0.0-beta.2+2");
> > +                
> > +                //merge down to develop
> > +                fixture.Repository.Checkout("develop");
> > +                fixture.Repository.MergeNoFF("release-2.0.0", Constants.SignatureNow());
> This will cause develop's version to bump? Everything else looks good to me
> 
> —
> Reply to this email directly or view it on GitHub.