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

Earn badges and make progress

You're on your way to the next level! Join the Kudos program to earn points and save your progress.

Deleted user Avatar
Deleted user

Level 1: Seed

25 / 150 points

Next: Root

Avatar

1 badge earned

Collect

Participate in fun challenges

Challenges come and go, but your rewards stay with you. Do more to earn more!

Challenges
Coins

Gift kudos to your peers

What goes around comes around! Share the love by gifting kudos to your peers.

Recognition
Ribbon

Rise up in the ranks

Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!

Leaderboard

Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Atlassian Community about banner
4,466,191
Community Members
 
Community Events
176
Community Groups

Merge strategies and/or Branch modeling with current workflow

Edited
Deleted user Jan 05, 2018

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

Atlassian Community Events