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
How to earn badges on the Atlassian Community

How to earn badges on the Atlassian Community

Badges are a great way to show off community activity, whether you’re a newbie or a Champion.

Learn more
Community showcase
Posted Jun 12, 2018 in Bitbucket

Do you use any Atlassian products for your personal projects?

After spinning my wheels trying to get organized enough to write a book for National Novel Writing Month (NaNoWriMo) I took my affinity for Atlassian products from my work life and decided to tr...

28,422 views 26 12
Join discussion

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