[Integrated] RFR: 378: Create merge conflict webrevs for "merge style" PRs without merge commit

Robin Westberg rwestberg at openjdk.java.net
Mon Apr 27 13:45:37 UTC 2020


On Thu, 23 Apr 2020 13:10:58 GMT, Robin Westberg <rwestberg at openjdk.org> wrote:

> Hi all,
> 
> Please review this change that creates a webrev containing only the merge conflicts for merge PRs that conflict with
> their target.
> Best regards,
> Robin

This pull request has now been integrated.

Changeset: bd3b96da
Author:    Robin Westberg <rwestberg at openjdk.org>
URL:       https://git.openjdk.java.net/skara/commit/bd3b96da
Stats:     130 lines in 4 files changed: 1 ins; 125 del; 4 mod

378: Create merge conflict webrevs for "merge style" PRs without merge commit

Reviewed-by: ehelin

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

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


More information about the skara-dev mailing list