[lambda-leftovers] RFR: Merge master [v2]

J.Duke duke at openjdk.java.net
Fri Sep 11 09:19:18 UTC 2020


> Hi all,
> 
> this is an _automatically_ generated pull request to notify you that there are 56 commits from the branch `master`that
> can **not** be merged into the branch `lambda-leftovers`:
> The following file contains merge conflicts:
> 
> - .jcheck/conf
> 
> All Committers in this [project](https://openjdk.java.net/census#Optional[amber]) have access to my [personal
> fork](https://github.com/openjdk-bot/amber) and can therefore help resolve these merge conflicts (you may want to
> coordinate who should do this). The following paragraphs will give an example on how to solve these merge conflicts and
> push the resulting merge commit to this pull request. The below commands should be run in a local clone of your
> [personal fork](https://wiki.openjdk.java.net/display/skara#Skara-Personalforks) of the
> [openjdk/amber](https://github.com/openjdk/amber) repository.  # Ensure target branch is up to date $ git checkout
> lambda-leftovers $ git pull https://github.com/openjdk/amber lambda-leftovers
> 
> # Fetch and checkout the branch for this pull request
> $ git fetch https://github.com/openjdk-bot/amber +63:openjdk-bot-63
> $ git checkout openjdk-bot-63
> 
> # Merge the target branch
> $ git merge lambda-leftovers
> 
> When you have resolved the conflicts resulting from the `git merge` command above, run the following commands to create
> a merge commit:
> $ git add paths/to/files/with/conflicts
> $ git commit -m 'Merge master'
> 
> 
> When you have created the merge commit, run the following command to push the merge commit to this pull request:
> 
> $ git push https://github.com/openjdk-bot/amber openjdk-bot-63:63
> 
> _Note_: if you are using SSH to push commits to GitHub, then change the URL in the above `git push` command accordingly.
> 
> Thanks,
> J. Duke

J. Duke has updated the pull request with a new target base due to a merge or a rebase. The pull request now contains
154 commits:

 - Resolving whitespace problem.
 - Merge master
 - Automatic merge of master into lambda-leftovers
 - Automatic merge of master into lambda-leftovers
 - Automatic merge of master into lambda-leftovers
 - Automatic merge of master into lambda-leftovers
 - Automatic merge of master into lambda-leftovers
 - Merge pull request #36 from openjdk-bot/58
   
   Merge master
 - manual merge
 - Automatic merge of master into lambda-leftovers
 - ... and 144 more: https://git.openjdk.java.net/amber/compare/48802268...add08282

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

Changes: https://git.openjdk.java.net/amber/pull/41/files
 Webrev: https://webrevs.openjdk.java.net/?repo=amber&pr=41&range=01
  Stats: 704 lines in 39 files changed: 503 ins; 68 del; 133 mod
  Patch: https://git.openjdk.java.net/amber/pull/41.diff
  Fetch: git fetch https://git.openjdk.java.net/amber pull/41/head:pull/41

PR: https://git.openjdk.java.net/amber/pull/41


More information about the amber-dev mailing list