Git Flow - What's the develop's version when a release branch is 'active'?
<p>I want to use git-flow in a new project. I've read a few articles and viewed some of the screencasts suggested in the github project. There's an unclear point regarding versioning. Let's assume the scenario below, where Cx is a commit and the numbers above or below the commit are the version of the branch at that point in time.</p>

<pre><code>              0.1     0.1       0.1          0.2
- develop ---- C1 ---- C2 ------ C4 ------ Merge ----
- release/0.2           \ --- C3 --- C5 ---/
                             0.2    0.2
</code></pre>

<p>So, there is kind of a grey zone (in my opinion) after branching off release/0.2 from develop. Commit C4 is not exactly 0.1 nor 0.2. The develop branch will be bumped to 0.2 after merging release/0.2 back to develop, but C4 was not part of the 0.2 release. Personally, if I looked at a repository and saw an update to v0.2, I'd assume every commit before that merge commit was included in the release. The following is my expectation:</p>

<pre><code>             0.1    0.1    0.2    0.2    0.2
- develop --- C1 --- C2 --- C3 --- C5 --- C4
</code></pre>

<p>Is my assumption wrong? Is it that we don't care how develop looks like, but we only care about master (since it's a result of dev + release branches)? I guess in the next release, all of those commits will be included as needed.</p>

<p>P.S. what's the artifact versions you use for nightlies? e.g. 0.1-SNAPSHOT? Following normal semver, 0.1-SNAPSHOT &lt; 0.1 which doesn't hold. Also, according to git flow, you don't know what your next release version will be until you branch off, so 0.2-SNAPSHOT is also 'not allowed'.</p>