Merging two branches

[Ritesh Keshri]

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 ? 

[Mikael Sandberg · Accepted solution]

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 

[Ritesh Keshri]

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]

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