Bitbucket : Workflow for hotfix...

Every time I try to do a hotfix - it goes pearshaped - I need to understand how to do it properly.

Scenario:
I have 2 branches.
Master contains the current production code
Develop contains the code I am working on.

I will be part way through working on something in the develop branch, and I'm told "Drop everything - there's a problem with the production code"

So - I commit and push what I am working on in the development branch
I create a hotfix branch
In my working directory I git fetch && git checkout hotfix

I fix the problem.  

I commit and push the hotfix.  

What pull requests do I now do to merge the hotfix to master and development?

0 answers

Suggest an answer

Log in or Sign up to answer
Community showcase
Published Nov 06, 2018 in Bitbucket

Upgrade Best Practices

Hello! My name is Mark Askew and I am a Premier Support Engineer for products Bitbucket Server/Data Center, Fisheye & Crucible. Today, I want to bring the discussion that Jennifer, Matt, and ...

439 views 6 9
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