[lambda-leftovers] RFR: Merge master [v2]
J.Duke
duke at openjdk.java.net
Fri Dec 11 17:35:30 UTC 2020
> Hi all,
>
> this is an _automatically_ generated pull request to notify you that there are 140 commits from the branch `master`that can **not** be merged into the branch `lambda-leftovers`:
>
> The following file contains merge conflicts:
>
> - src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
>
> All Committers in this [project](https://openjdk.java.net/census#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.git lambda-leftovers
>
> # Fetch and checkout the branch for this pull request
> $ git fetch https://github.com/openjdk-bot/amber.git +77:openjdk-bot-77
> $ git checkout openjdk-bot-77
>
> # 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.git openjdk-bot-77:77
>
> _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 incremental webrev excludes the unrelated changes brought in by the merge/rebase.
-------------
Changes:
- all: https://git.openjdk.java.net/amber/pull/74/files
- new: https://git.openjdk.java.net/amber/pull/74/files/80dac5a8..7279b94e
Webrevs:
- full: https://webrevs.openjdk.java.net/?repo=amber&pr=74&range=01
- incr: https://webrevs.openjdk.java.net/?repo=amber&pr=74&range=00-01
Stats: 682 lines in 39 files changed: 503 ins; 51 del; 128 mod
Patch: https://git.openjdk.java.net/amber/pull/74.diff
Fetch: git fetch https://git.openjdk.java.net/amber pull/74/head:pull/74
PR: https://git.openjdk.java.net/amber/pull/74
More information about the amber-dev
mailing list