Stash Merging Hotfix from previous tag back into master

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 ;-)


3 answers

1 accepted

This widget could not be displayed.

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 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:

This widget could not be displayed.
Timothy Chin Community Champion Aug 14, 2014

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 (!workflow-gitflow).

This widget could not be displayed.

Thank you Stefan! Your article was great. To clarify, you do not use a develop/ branch, but rather master/ for integration? And then your hotfixes will get to your release and back to master. Do you tag master/ or release/ ?

Suggest an answer

Log in or Sign up to answer
Community showcase
Published Aug 21, 2018 in Bitbucket

Branch Management with Bitbucket

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...

1,317 views 8 11
Read article

Atlassian User Groups

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!

Find my local user group

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

Groups near you