[sealed-types] Integrated: Merge master
J.Duke
duke at openjdk.java.net
Fri Sep 18 17:05:44 UTC 2020
On Fri, 18 Sep 2020 13:19:15 GMT, J. Duke <duke at openjdk.org> wrote:
> Hi all,
>
> this is an _automatically_ generated pull request to notify you that there are 76 commits from the branch `master`that
> can **not** be merged into the branch `sealed-types`:
> 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
> sealed-types $ git pull https://github.com/openjdk/amber sealed-types
>
> # Fetch and checkout the branch for this pull request
> $ git fetch https://github.com/openjdk-bot/amber +66:openjdk-bot-66
> $ git checkout openjdk-bot-66
>
> # Merge the target branch
> $ git merge sealed-types
>
> 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-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
This pull request has now been integrated.
Changeset: 053f47d0
Author: Vicente Romero <vicente.romero at oracle.com>
URL: https://git.openjdk.java.net/amber/commit/053f47d0
Stats: 38 lines in 6 files changed: 0 ins; 32 del; 6 mod
manual merge
-------------
PR: https://git.openjdk.java.net/amber/pull/52
More information about the amber-dev
mailing list