amber-docs
amber-docs copied to clipboard
adding links to Inside.java and Dev.java
Creating this PR because I wanted to point to Amber's wiki but realized it didn't point back to all the aggregated Amber content on Inside.java. I included Dev.java as well but can remove if it's not specific enough. It does have a lot of Amber coverage throughout.
Progress
- [x] Change must not contain extraneous whitespace
Reviewing
Using git
Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/amber-docs pull/12/head:pull/12
$ git checkout pull/12
Update a local copy of the PR:
$ git checkout pull/12
$ git pull https://git.openjdk.java.net/amber-docs pull/12/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 12
View PR using the GUI difftool:
$ git pr show -t 12
Using diff file
Download this PR as a diff file:
https://git.openjdk.java.net/amber-docs/pull/12.diff
:wave: Welcome back carimura! A progress list of the required criteria for merging this PR into master
will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.
@carimura This change is no longer ready for integration - check the PR body for details.
:warning: @carimura a branch with the same name as the source branch for this pull request (master
) is present in the target repository. If you eventually integrate this pull request then the branch master
in your personal fork will diverge once you sync your personal fork with the upstream repository.
To avoid this situation, create a new branch for your changes and reset the master
branch. You can do this by running the following commands in a local repository for your personal fork. Note: you do not have to name the new branch NEW-BRANCH-NAME
.
$ git checkout -b NEW-BRANCH-NAME
$ git branch -f master 11c2d1e214f64478eada689ee8228633541df82a
$ git push -f origin master
Then proceed to create a new pull request with NEW-BRANCH-NAME
as the source branch and close this one.
@carimura this pull request can not be integrated into master
due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:
git checkout master
git fetch https://git.openjdk.org/amber-docs.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push