RFR: merge-bot: create integrateable pull requests

Robin Westberg rwestberg at openjdk.java.net
Thu Apr 2 04:29:50 UTC 2020

On Wed, 1 Apr 2020 14:26:58 GMT, Erik Helin <ehelin at openjdk.org> wrote:

> Hi all,
> please review this patch that makes the merge bot creates pull requests that can be integrated. With this new version
> of the merge bot contributors will be able to update the "merge style" PR created by the automatic merge bot. This
> should reduce the overhead quite a bit for resolving a merge conflict.  With the new workflow a contributor would have
> to something like the following (assuming they have a remote named `openjdk-bot`):
> $ git fetch openjdk-bot
> $ git checkout openjdk-bot/17
> $ git merge <target branch>
> $ # fix merge conflicts
> $ git add -u
> $ git commit -m "Merge <from branch>"
> $ git push
> Testing:
> - `make test`
> - Updated unit tests
> Thanks,
> Erik

Looks good, nice improvement! I think it would be useful with an additional test that performs the /sponsor command as
well and validates the actual pushed commit, to ensure that author and committer is set properly.

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

> 314:                                     // Other reply, potentially due to rebase issue, just
> 315:                                     // wait for the labeler to add appropriate labes.
> 316:                                 }


                                    // wait for the labeler to add appropriate labels.


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

More information about the skara-dev mailing list