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!

Ana

Comment

Log in or Sign up to comment
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
Published Thursday in Marketplace Apps

Tips on how to choose the best estimation method for your planning

Planning and grooming sessions all come with their own sets of rules. Team members meet to estimate stories or other work items, all according to an agreed-upon process. And with every session comes ...

85 views 0 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