Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

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

Ana Retamal Atlassian Team Jan 08, 2018

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
TAGS
Community showcase
Posted in Bitbucket

Share your use cases: How do you use the Bitbucket-Jira integration? How does it help your team?

Hey everyone, over the past year, we've added several new features to how you can use Bitbucket and Jira together. We'd love to know how you'll are using the integration and how it's helping your tea...

37 views 0 1
Join discussion

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you