Switch merge command in Pull Request to 'merge --squash'

Is it possible to change Stash behaviour of pull requests merging? PR from from_branch to master will perform merge, that produce commit with two parrents. Is it possible to specify some magic property in stash-config.properties file to replace merge command by 'merge --squash'. This will produce master branch with linear hstory from merge commits only.

But it also broke logic of stash of reachablity detection PR commits from target branch.

1 answer

1 accepted

1 vote
Accepted answer

Hi Alexey,

I'm confused. You've talked with Bryan before about this and you know there is configuration that can enable this?

https://jira.atlassian.com/browse/STASH-2810

I don't know what you mean about reachability detection being broken?

Cheers,

Charles

Hi Charles, `merge --squash` do different thing. It remove right parent link. Only create merge commit into master for example as is no pull request was created at all. This merge commit will have only one parent link.

Oops, it really that is need! Thank you!

Suggest an answer

Log in or Sign up to answer
Community showcase
Published Nov 06, 2018 in Bitbucket

Upgrade Best Practices

Hello! My name is Mark Askew and I am a Premier Support Engineer for products Bitbucket Server/Data Center, Fisheye & Crucible. Today, I want to bring the discussion that Jennifer, Matt, and ...

216 views 3 7
Read article

Atlassian User Groups

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!

Find my local user group

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

Groups near you