RFR: Improve handling of squash and rebase of PRs
Kevin Rushforth
kcr at openjdk.java.net
Fri Apr 17 15:44:39 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
I presume that there will be no change in the commit that is produced for non-merge PRs?
-------------
PR: https://git.openjdk.java.net/skara/pull/589
More information about the skara-dev
mailing list