Skip to content

Cherry pick master #1281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Conversation

sy-records
Copy link
Member

Summary

cherry-pick #1263 #1251

What kind of change does this PR introduce? (check at least one)

  • Bugfix
  • Feature
  • Code style update
  • Refactor
  • Docs
  • Build-related changes
  • Other, please describe:

If changing the UI of default theme, please provide the before/after screenshot:

Does this PR introduce a breaking change? (check one)

  • Yes
  • No

If yes, please describe the impact and migration path for existing applications:

The PR fulfills these requirements:

  • When resolving a specific issue, it's referenced in the PR's title (e.g. fix #xxx[,#xxx], where "xxx" is the issue number)

You have tested in the following browsers: (Providing a detailed version will be better.)

  • Chrome
  • Firefox
  • Safari
  • Edge
  • IE

If adding a new feature, the PR's description includes:

  • A convincing reason for adding this feature
  • Related documents have been updated
  • Related tests have been updated

To avoid wasting your time, it's best to open a feature request issue first and wait for approval before working on it.

Other information:


  • DO NOT include files inside lib directory.

trusktr and others added 3 commits July 12, 2020 10:16
* Update language-highlight.md

* Update language-highlight.md

Co-authored-by: 沈唁 <[email protected]>
Proposed changes described in comment from docsifyjs#1251
@vercel
Copy link

vercel bot commented Jul 12, 2020

This pull request is being automatically deployed with Vercel (learn more).
To see the status of your deployment, click below or on the icon next to each commit.

🔍 Inspect: https://vercel.com/docsify-core/docsify-preview/dm2cgdc4k
✅ Preview: https://docsify-preview-git-fork-sy-records-cherry-pick-master.docsify-core.vercel.app

@codesandbox-ci
Copy link

This pull request is automatically built and testable in CodeSandbox.

To see build info of the built libraries, click here or the icon next to each commit SHA.

Latest deployment of this branch, based on commit 876bf6d:

Sandbox Source
docsify-template Configuration

Copy link
Member

@trusktr trusktr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.

Tip: to save your self some work next time, you could just make a pull request to merge master into develop. After we merge this PR, master will still contain unique commits until we merge develop to master, where otherwise a pull request from master to develop would mean that master would no longer contain unique commits that aren't on develop.

Not a big deal though! In the end it all works out. :)

@jhildenbiddle
Copy link
Member

@sy-records --

Am I correct that the purpose of this PR is to cherry-pick changes that were merged into the master branch and merge them into the develop branch? Apologies for asking what probably seems obvious. Just want to confirm before approving.

@sy-records
Copy link
Member Author

Yes, we need to merge several previous commits into the develop

@sy-records sy-records closed this Jul 14, 2020
@sy-records sy-records deleted the cherry-pick-master branch July 16, 2020 00:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants