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

Different merge strategies when merging develop to master

I have two branches, "develop" which has all the latest code and "master" which has the released code. So when I am working on a new feature I create a feature branch from "develop", and when I am done I merge to "develop". After working on several features I make a new release by merging "develop" to "master.

I want to use the default merge strategy "Merge commit", I guess, when I merge feature branches to develop and "Squash" merge strategy when I merge "develop" to "master" is that doable in Bitbucket?

0 answers

Suggest an answer

Log in or Sign up to answer
Community showcase
Published in Bitbucket

Powering DevOps with Bitbucket Server & Data Center

Hi everyone, The Cloud team recently announced 12 new DevOps features that help developers ship better code, faster   ! While we’re all excited about the new improvements to Bitbucket ...

1,892 views 0 7
Read article

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