RFR: merge-bot: update message for failed merges

Robin Westberg rwestberg at openjdk.java.net
Mon Feb 10 10:59:46 UTC 2020

On Mon, 10 Feb 2020 10:27:05 GMT, Erik Helin <ehelin at openjdk.org> wrote:

> Hi all,
> please review this patch that updates the merge bot to produce a nicer message
> (and clearer instructions) in the failed merge pull requests. The message will
> now include the files that contains merge conflicts. I also updated the message
> to limit the number of files and commits it lists (currently capped to ten
> each). Finally I also fixed the instructions for fixing a merge conflict to be
> correct ��
> Testing:
> - added unit test for `ReadOnlyRepository::status`
> - `make test` passes on Linux x64
> Thanks,
> Erik

Looks good, only a spelling comment!

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

> 470:                     message.add("");
> 471:                     message.add("Now processed to create a pull request towards this repository.");
> 472:                     message.add("If you are using the [Skara](https://wiki.openjdk.java.net/display/skara#Skara-Skara)" +


                    message.add("Now proceed to create a pull request towards this repository.");


Marked as reviewed by rwestberg (Reviewer).

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

More information about the skara-dev mailing list