[Integrated] RFR: Improve handling of squash and rebase of PRs
rwestberg at openjdk.java.net
Tue Apr 28 04:55:41 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,
This pull request has now been integrated.
Author: Robin Westberg <rwestberg at openjdk.org>
Stats: 437 lines in 12 files changed: 132 ins; 265 del; 40 mod
Improve handling of squash and rebase of PRs
More information about the skara-dev