intro 2차 리뷰#244
Merged
Violet-Bora-Lee merged 2 commits intojavascript-tutorial:masterfrom Oct 2, 2019
Merged
Conversation
Member
|
upstream(저희 저장소)을 반영해주셔야해요. 지금은 충돌상태라 머지가 안됩니다. |
Member
Contributor
Author
|
죄송합니다. 회사 일로 수정이 늦었습니다. upstream 반영했습니다. |
Member
|
회사일로 바쁘신 가운데 기여해주셔서 감사합니다. |
Member
|
다음엔 upstream을 받아올 때, pull(==fetch+merge)말고, fetch후 rebase하는 방식으로 도전해보세요~ |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
정리해서 다시 PR 날립니다.