[Rev 01] RFR: merge-bot: create integrateable pull requests

Erik Helin ehelin at openjdk.java.net
Thu Apr 2 06:24:54 UTC 2020

> 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

Erik Helin has updated the pull request incrementally with one additional commit since the last revision:

  Allow sponsor and full title for merge commits


  - all: https://git.openjdk.java.net/skara/pull/557/files
  - new: https://git.openjdk.java.net/skara/pull/557/files/85d52505..7f84c6b9

 - full: https://webrevs.openjdk.java.net/skara/557/webrev.01
 - incr: https://webrevs.openjdk.java.net/skara/557/webrev.00-01

  Stats: 14 lines in 1 file changed: 7 ins; 0 del; 7 mod
  Patch: https://git.openjdk.java.net/skara/pull/557.diff
  Fetch: git fetch https://git.openjdk.java.net/skara pull/557/head:pull/557

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

More information about the skara-dev mailing list