Skip to content

8299902: Support for MarkDown javadoc in JShell#11936

Closed
lahodaj wants to merge 12 commits into
openjdk:masterfrom
lahodaj:markdown-in-jshell
Closed

8299902: Support for MarkDown javadoc in JShell#11936
lahodaj wants to merge 12 commits into
openjdk:masterfrom
lahodaj:markdown-in-jshell

Conversation

@lahodaj

@lahodaj lahodaj commented Jan 11, 2023

Copy link
Copy Markdown
Contributor

Adding support for MarkDown javadoc in the JShell


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/11936/head:pull/11936
$ git checkout pull/11936

Update a local copy of the PR:
$ git checkout pull/11936
$ git pull https://git.openjdk.org/jdk pull/11936/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 11936

View PR using the GUI difftool:
$ git pr show -t 11936

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/11936.diff

@bridgekeeper

bridgekeeper Bot commented Jan 11, 2023

Copy link
Copy Markdown

👋 Welcome back jlahoda! A progress list of the required criteria for merging this PR into pr/11701 will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk Bot added the rfr Pull request is ready for review label Jan 11, 2023
@openjdk

openjdk Bot commented Jan 11, 2023

Copy link
Copy Markdown

@lahodaj The following labels will be automatically applied to this pull request:

  • compiler
  • javadoc
  • kulla

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk Bot added javadoc javadoc-dev@openjdk.org compiler compiler-dev@openjdk.org kulla kulla-dev@openjdk.org labels Jan 11, 2023
@mlbridge

mlbridge Bot commented Jan 11, 2023

Copy link
Copy Markdown

Webrevs

@bridgekeeper

bridgekeeper Bot commented Feb 8, 2023

Copy link
Copy Markdown

@lahodaj This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@openjdk-notifier openjdk-notifier Bot changed the base branch from pr/11701 to master February 20, 2023 23:58
@openjdk-notifier

Copy link
Copy Markdown

The parent pull request that this pull request depends on has been closed without being integrated and the target branch of this pull request has been updated as the previous branch was deleted. This means that changes from the parent pull request will start to show up in this pull request. If closing the parent pull request was done in error, it will need to be re-opened and this pull request will need to manually be retargeted again.

@openjdk

openjdk Bot commented Feb 20, 2023

Copy link
Copy Markdown

@lahodaj 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 markdown-in-jshell
git fetch https://git.openjdk.org/jdk master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk

openjdk Bot commented Feb 21, 2023

Copy link
Copy Markdown

⚠️ @lahodaj This pull request contains merges that bring in commits not present in the target repository. Since this is not a "merge style" pull request, these changes will be squashed when this pull request in integrated. If this is your intention, then please ignore this message. If you want to preserve the commit structure, you must change the title of this pull request to Merge <project>:<branch> where <project> is the name of another project in the OpenJDK organization (for example Merge jdk:master).

@openjdk openjdk Bot added the merge-conflict Pull request has merge conflict with target branch label Feb 21, 2023
@lahodaj lahodaj closed this Mar 9, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

compiler compiler-dev@openjdk.org javadoc javadoc-dev@openjdk.org kulla kulla-dev@openjdk.org merge-conflict Pull request has merge conflict with target branch rfr Pull request is ready for review

Development

Successfully merging this pull request may close these issues.

2 participants