[patterns-stage-2] RFR: Merge master [v2]
J.Duke
duke at openjdk.java.net
Fri Oct 2 05:07:04 UTC 2020
> Hi all,
>
> this is an _automatically_ generated pull request to notify you that there are 109 commits from the branch `master`that
> can **not** be merged into the branch `patterns-stage-2`:
> The following file contains merge conflicts:
>
> - src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.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
> patterns-stage-2 $ git pull https://github.com/openjdk/amber.git patterns-stage-2
>
> # Fetch and checkout the branch for this pull request
> $ git fetch https://github.com/openjdk-bot/amber.git +66:openjdk-bot-66
> $ git checkout openjdk-bot-66
>
> # Merge the target branch
> $ git merge patterns-stage-2
>
> 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-66:66
>
> _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 incrementally with 350 additional commits since the last revision:
- Merge master
- Automatic merge of master into pattern-runtime
- Merge pull request #53 from openjdk-bot/66
Merge master
- manual merge
- Merge pull request #44 from openjdk-bot/66
Merge master
- Merge master
- Automatic merge of master into pattern-runtime
- Automatic merge of master into pattern-runtime
- Automatic merge of master into pattern-runtime
- Automatic merge of master into pattern-runtime
- ... and 340 more: https://git.openjdk.java.net/amber/compare/3c4e824a...e0aa5308
-------------
Changes:
- all: https://git.openjdk.java.net/amber/pull/60/files
- new: https://git.openjdk.java.net/amber/pull/60/files/3c4e824a..e0aa5308
Webrevs:
- full: https://webrevs.openjdk.java.net/?repo=amber&pr=60&range=01
- incr: https://webrevs.openjdk.java.net/?repo=amber&pr=60&range=00-01
Stats: 1964 lines in 70 files changed: 1691 ins; 107 del; 166 mod
Patch: https://git.openjdk.java.net/amber/pull/60.diff
Fetch: git fetch https://git.openjdk.java.net/amber pull/60/head:pull/60
PR: https://git.openjdk.java.net/amber/pull/60
More information about the amber-dev
mailing list