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

[Alexey_Efimov]

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.

[cofarrell · Accepted solution]

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

[Alexey_Efimov]

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.

[Alexey_Efimov]

Oops, it really that is need! Thank you!