Bitbucket gitflow and main branch


I'm trying to implement gitflow using Bitbucket and for that I want to change my main branch from master to develop. The daily development work will be done on develop and branching to feature branches and then pull requests back to develop. I think it makes more sense to have develop set to the main branch, right?

However, when doing this, Bitbucket won't let me merge changes from develop back to master.

Am I missing something? What is the proposed way of implementing gitflow on Bitbucket?

3 answers

Was looking for this too. I think you need to 'git flow init' your local repo then push it to the remote. Just make a copy I have yet to do this myself.

I know this is years later, but I still wasn't able to find a definitive answer to whether the "main branch" in BitBucket should be develop or master for gitflow. I chose develop, which makes reintegrating feature branches easier. Then I use SourceTree's Git Flow button to handle releases or hotfixes.

It seems to me that whether I choose develop or master for the "main branch" setting, BitBucket just isn't going to be able to handle reintegrating a hotfix or release branch into both develop and master in one step. For those, I think I would have to do two merges, one to the "main branch" and then change the destination of the merge for the other.

Suggest an answer

Log in or Join to answer
Community showcase
Piotr Plewa
Published Dec 27, 2017 in Bitbucket

Recipe: Deploying AWS Lambda functions with Bitbucket Pipelines

Bitbucket Pipelines helps me manage and automate a number of serverless deployments to AWS Lambda and this is how I do it. I'm building Node.js Lambda functions using node-lambda&nbsp...

650 views 0 4
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
Atlassian Team Tour

Join us on the Team Tour

We're bringing product updates and pro tips on teamwork to ten cities around the world.

Save your spot