Squash merge

Hello,

Is there a way to configure upsource to do squash merges in git when merging branches?

5 comments
Comment actions Permalink

Hello,

Upsource doesn't do any manipulations in your repository, but only reads data. However, if you do branch squash in git (to a single commit), Upsource will transplant all review's discussions accordingly.

0
Comment actions Permalink

Hi,

 

Upsource has a merge button on the branch page:

 

Does this button not work? Basically I was looking for a way to configure the behavior of that button,

0
Comment actions Permalink

Oh, you mean this one. It's an API call to GtiHub... Not sure they have squash option available through a public API. 

0
Comment actions Permalink

Okay, I set up the github integration right away and did not realize it was part of that.

 

It looks like the Github API supports squashing: https://developer.github.com/v3/pulls/#merge-a-pull-request-merge-button. Do you think that will ever be configurable in the future? Is any part of the Github integration open source if not?

0
Comment actions Permalink

You know, that sounds reasonable. We'll add this feature in one of the nearest releases.

Please see the request: https://youtrack.jetbrains.com/issue/UP-9555

0

Please sign in to leave a comment.