RFR: Add merge bot

Robin Westberg via github.com duke at openjdk.java.net
Thu Aug 29 10:22:37 UTC 2019

On Thu, 29 Aug 2019 10:16:20 GMT, Erik Duveblad via github.com <duke at openjdk.java.net> wrote:

> Hi,
> this patch adds a merge bot. The merge automatically tries to merge a branch from one repository to another. If the merge fails then the bot will open a PR describing the commits that couldn't be merge. Once the conflicts have been resolved and pushed/integrated by a human contributor, then the bot will automatically close the PR.
> ## Testing
> - [x] `sh gradlew test` passes on Linux x86_64
> - [x] Added four new unit tests
> Thanks,
> Erik
> ----------------
> Commits:
>  - 7fc5a814:	Add merge bot
> Pull request:
> https://git.openjdk.java.net/skara/pull/104
> Webrev:
> https://webrevs.openjdk.java.net/skara/104/webrev.00
> Patch:
> https://git.openjdk.java.net/skara/pull/104.diff
> Fetch command:
> git fetch https://git.openjdk.java.net/skara pull/104/head:pull/104

This PR has been reviewed by Robin Westberg via github.com - changes are approved. Review comment:

Looks good, don't need to re-review if you update the merge conflict message!

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

bots/merge/src/main/java/org/openjdk/skara/bots/merge/MergeBot.java line 168:

> 167:                 message.add("Push the resulting merge conflict to your personal fork and " +
> 168:                             "create a pull request towards this repository. Finally close this pull request " +
> 169:                             "once the pull request with the resolved conflicts has been integrated.");

Since you close the PR automatically, this message should probably be updated.

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

More information about the skara-dev mailing list