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

Merging two branches

I'm currently transitioning from Perforce to Bitbucket. I would like to know if bitbucket allows commit-based merge between two branches. Let me elaborate my question with Perforce example. Perforce offers the option to merge only specific change list and ignore other change lists. does bitbucket offer such a mechanism ? 

1 answer

1 accepted

0 votes
Answer accepted
Mikael Sandberg Community Leader Nov 18, 2019

Hi @Ritesh Keshri,

Welcome to the Atlassian Community.

No, Bitbucket do not allow you to select specific commits when doing a Pull Request. All commits on the source branch will be part of the merge. Git does allow you to cherry-pick, so it is possible to do. You can find more information about cherry-picking here, https://git-scm.com/docs/git-cherry-pick 

Thanks, @Mikael Sandberg. I assume that Bitbucket doesn't differentiate between the actions performed through bitbucket UI and command line.  An auto-merge script can be written to perform such cherry-pick merging (using git commands) and can be run on bitbucket server. 

Mikael Sandberg Community Leader Nov 19, 2019

Correct. We have repositories that are automatically merged via a Jenkins job.

Suggest an answer

Log in or Sign up to answer
TAGS
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,849 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