You're on your way to the next level! Join the Kudos program to earn points and save your progress.
Level 1: Seed
25 / 150 points
1 badge earned
Challenges come and go, but your rewards stay with you. Do more to earn more!
What goes around comes around! Share the love by gifting kudos to your peers.
Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!
Join now to unlock these features and more
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.
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.