Sync original #91
Merged
Sync original #91
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* add warning for invalid hook call * Fix versions * Split code examples * unnecessary comma * tweaks * Update content/warnings/invalid-hook-call-warning.md Co-Authored-By: gaearon <dan.abramov@gmail.com> * nit
This reverts commit e301239.
…into gaearon-hooks-stable
Update docs for stable Hooks
* react-testing-library now supports `act` * fix typo
Support Custom-ID Markdown Syntax
|
Wow, I was anticipating something very tedious, but there are only four conflicts and all of them are fairly easy to resolve :) So should I directly push to this branch to resolve conflicts? |
|
Haha, the spanish fork translated more hooks articles so they have more conflicts :P Just direct push to the branch! |
|
Done! Actually this merge has changes that involve several ongoing PRs, but I'll take care of notifying the translators. |
smikitky
approved these changes
Feb 7, 2019
This was referenced Feb 7, 2019
Merged
Merged
Merged
|
@smikitky I think it shouldn't squash-merge. it should keep the original commits. |
|
Okay, I re-enabled merge commits. |
|
@koba04 Could you approve? We should merge this PR before @takanorip and I can update the corresponding PRs. |
|
@smikitky OK, I'll review this soon 🚀 |
koba04
approved these changes
Feb 7, 2019
|
done |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Doing this manually since there's a ton of commits.
The only page that has interfering translations is
hooks-intro.md. It seems like thegit mergeis pretty smart about only creating a conflict where the english text has changed!https://github.com/reactjs/ja.reactjs.org/pull/91/files#diff-daed9eb3a7702fb9fe0397b0f613d4faL8