Gitflow allows merging bugfixes from release to develop. GitFlowVersion doesn't about gitversion HOT 9 CLOSED

Pretty this is a duplicate of this one? (or at least related)

#79

from gitversion.

@danielmarbach I'll take a look at it

from gitversion.

Here the flow which should work but doesn't

@danielmarbach Can you elaborate on what you'd expect to be produced?

FWIW, the PreReleasePartTwo holds the number of commits that are not known by the develop branch. Once the release branch is merged back in develop, this number of commits is indeed zero.

from gitversion.

In my scenario and according to GF it is perfectly valid to do changes on the release branch and merge does changes back into develop. To be honest I see the need for you guys that at some point you know the release branch is merged and therefore the commit count is reseted. So I have no idea how to solve that properly. I mean I can live with cherry picking approach... What's your thought on this?

from gitversion.

I'm not sure to understand what prevents one to merge the release branch back into develop? I may be missing something obvious (sorry for that).

from gitversion.

You can only do that once. If done the commit counter on the release branch is zeroed.

from gitversion.

@danielmarbach Well, I'm pretty sure if you add a commit to that branch, the commit counter will spring back to one (ie. a new commit on that branch that develop doesn't know about.)

release    B-C-D---------F
          /     \
develop -A-------E

In the graph above, release has been merged back into develop with E. Building release when pointing at F should issue a commit number of 1.

from gitversion.

Yeah but in this case you are practically regenerating previous SemVers!

From: nulltoken [mailto:[email protected]]
Sent: Samstag, 22. Februar 2014 23:14
To: Particular/GitFlowVersion
Cc: danielmarbach
Subject: Re: [GitFlowVersion] Gitflow allows merging bugfixes from release to develop. GitFlowVersion doesn't (#86)

@danielmarbach https://github.com/danielmarbach Well, I'm pretty sure if you add a commit to that branch, the commit counter will spring back to one (ie. a new commit on that branch that develop doesn't know about.)

release B-C-D---------F
/
develop -A-------E

In the graph above, release has been merged back into develop with E. Building release when pointing at F should issue a commit number of 1.

—
Reply to this email directly or view it on GitHub #86 (comment) . https://github.com/notifications/beacon/174258__eyJzY29wZSI6Ik5ld3NpZXM6QmVhY29uIiwiZXhwaXJlcyI6MTcwODY0MDAzOSwiZGF0YSI6eyJpZCI6MjYwOTQ4Njh9fQ==--a78e11530f2df7088903257004cb6b5dd8d4fd27.gif

from gitversion.

Pretty sure this is now fixed

from gitversion.