We were discussing branching model for 4.2.1 release on the meeting 2012-04-17.
The problem is release/4.2.1.Final branch was opened to handle long-term work on that branch.
Along the way, we have setup continuous integration for this branch.
Finally, we have changed versions on this branch from 4.2.1-SNAPSHOT to 4.2.1.Final.
We have implemented this model since we identified the originally designed workflow won't work since it would require a lot of cherry-picking (develop on branch and cherry-pick to release-minor branch).
But it brought some issues:
As we have discussed, the origianl Git Flow didn't run into this problem, since it was designed for short-running hotfix releases instead of long-running development on branch divergred from tag.
To fix this, I would suggest following strategy in next minor release:
|Retrieving data ...|