RFR: Improve handling of squash and rebase of PRs

Mon Apr 20 06:34:51 UTC 2020

On Fri, 17 Apr 2020 15:22:26 GMT, Robin Westberg <rwestberg at openjdk.org> wrote:

> Hi all,
> 
> Please review this change that improves how we perform squashing and rebasing before doing the final integration.
> Instead of using squash / rebase, simply merge the latest state of the target branch. Use the final state (tree) to
> create the commit, and specify the proper parents. This has the benefit of working for merge PRs as well.  Best regards,
> Robin

Wow @rwestberg, this PR is :partying_face:�� Very nice work to re-use the same logic for both regular squashed +
rebased commits _and_ for merge commits ��

-------------

Marked as reviewed by ehelin (Reviewer).

PR: https://git.openjdk.java.net/skara/pull/589