We are following the gitflow workflow for our Stash project, but we've hit a snag and I can't find anything specific to our issue in the Atlassian documentation. Here's the scenario:
Master branch is tagged with v1.0 and then v2.0. Bug is found against v1.0, hotfix/ branch is created against v1.0. But what is the best way to merge back in? The Git Tutorial says I should merge hotfixes back into master and down to develop, but in this case, merging to master doesn't seem what I want. Am I stuck with making my hotfix/ branch my tagged v1.0.1?
There is a similar question on SO, but I didn't like the answers ;-)
You may not like this answer either but I thinkg gitflow is not the best fit if you care about old releases.
In Stash we are using http://blogs.atlassian.com/2013/10/inside-atlassian-feature-branching-on-the-stash-team/with long running release branches and a clear policy on how bug fixes get merged and how those change flow from the oldest to newer release branches up to master.
I've also tried to capture the underlying principles (when to merge what where) here: http://blogs.atlassian.com/2013/11/the-essence-of-branch-based-workflows/
If you have a a branch that sits below master (and in this case develop), I think you should go to that branch first.
Take a look at Maintenance Branches here (https://www.atlassian.com/git/workflows#!workflow-gitflow).
As a project manager, I have discovered that different developers want to bring their previous branching method with them when they join the team. Some developers are used to performing individual wo...
Connect with like-minded Atlassian users at free events near you!Find a group
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG
You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs