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.
As a project manager, I have discovered that different developers want to bring their previous branching method with them when they join the team. Some developers are used to performing individual wo...
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!
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