I'm new(ish) to git and the company I work for are moving from subversion to git. We're looking at using the git-flow workflow and am reasonably happy with how this will work. However, I have one question regarding "point" releases from the release branch. Let me explain what I mean by this.
We decide to create a release so we create a new release branch, say 1.0. We continue development on the "develop" branch, adding new feature branches, etc. The 1.0 release is issued to our test team and they find issues with it. As I understand, these issues are supposed to be fixed on the release branch, 1.0 and then when testing is finished, all changes are merged from the release 1.0 branch to master and develop, and tagged on master as an official release.
Hopefully I've got this right.
Now, during the testing of release 1.0 we may need to provide the test team with a new point release, i.e. 1.1 which includes the changes we've made to fix their issues. We need it to be called 1.1 for traceability, i.e so we can ensure they're actually testing 1.1. However, git-flow seems to suggest that this should be a separate release branch, i.e. 1.1.
I guess the question I'm asking is how to we "mark" the release branch as 1.1 even though it is called 1.0.
I'm prepared to accept that I may be coming at this incorrectly given we've previously only worked with svn, and would welcome any clarifcation offered.
