Merge strategies and/or Branch modeling with current workflow Edited

I'm new to Bitbucket Server, and I'm trying to determine the proper settings to apply to work well with our internal workflow.


We currently use a master branch for production, and a test branch for user acceptance.  When projects come in we create a new branch from the master, say Project 1.  When we have the code change ready, we do a pull request into the test branch.  Then when the users give the go ahead, we do a pull request into the master.  This seems to work well most of the time, but we have ran into instances where old changes show up in new branches.

Branch Structure.png


From what I gather all of our project branches & the test branch should be ahead of the master or at the same commit for this to work smoothly.  We currently aren't using the Branch Modeling feature, and we have the Merge Strategy set to the default (Merge commit).


Any advice on how we should configure Bitbucket would be much appreciated.

1 comment

Hi Anthony! Looks like it might be a good idea for you to adopt the  Feature Branch Workflow. 

However, there might be different approaches or opinions regarding your question, so I'll move this post to the discussions section to allow other users to chip in with their ideas. 

Hope this helps!



Log in or Join to comment
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...

1,248 views 1 5
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