Sync with reactjs.org @ f767be60 #118
Merged
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
smikitky
approved these changes
Feb 13, 2019
Merged
koba04
approved these changes
Feb 13, 2019
|
@koba04 これはやっぱり master を一旦マージせずに直接マージコミット作る方が正しそうな気がします… |
|
@smikitky syncの場合はそうですね。この場合は、無視してmergeしちゃっていいかなと思います。squashしない点も他とは異なりますし。 |
|
"admin権限を使って強制的にマージする" みたいなチェックボックスをチェックする必要がありましたが、マージはできました |
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.
This PR was automatically generated.
Merge changes from reactjs.org at f767be6
The following files have conflicts and may need new translations:
DO NOT SQUASH MERGE THIS PULL REQUEST!
Doing so will "erase" the commits from master and cause them to show up as conflicts the next time we merge.