[patterns] [Rev 01] RFR: Merge pattern-runtime
J.Duke
duke at openjdk.java.net
Tue Jun 2 20:49:03 UTC 2020
> Hi all,
>
> this is an _automatically_ generated pull request to notify you that there are 75 commits from the branch
> `pattern-runtime`that can **not** be merged into the branch `patterns`:
> 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#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
> patterns $ git pull https://github.com/openjdk/amber patterns
>
> # Fetch and checkout the branch for this pull request
> $ git fetch https://github.com/openjdk-bot/amber +50:openjdk-bot-50
> $ git checkout openjdk-bot-50
>
> # Merge the target branch
> $ git merge patterns
>
> 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 pattern-runtime'
>
>
> 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-50:50
>
> _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.
This pull request has now been integrated.
Changeset: 827a599b
Author: Vicente Romero <vicente.romero at oracle.com>
URL: https://git.openjdk.java.net/amber/commit/827a599b
Stats: 4602 lines in 118 files changed: 154 ins; 4174 del; 274 mod
manual merge
-------------
Changes:
- all: https://git.openjdk.java.net/amber/pull/30/files
- new: https://git.openjdk.java.net/amber/pull/30/files/fa0e7f06..827a599b
Webrevs:
- full: https://webrevs.openjdk.java.net/amber/30/webrev.01
- incr: https://webrevs.openjdk.java.net/amber/30/webrev.00-01
Stats: 4604 lines in 118 files changed: 4176 ins; 156 del; 272 mod
Patch: https://git.openjdk.java.net/amber/pull/30.diff
Fetch: git fetch https://git.openjdk.java.net/amber pull/30/head:pull/30
PR: https://git.openjdk.java.net/amber/pull/30
More information about the amber-dev
mailing list