[문서] 과제 C29 충돌 해결#1853
Open
taejinchoi-cbnu wants to merge 8 commits into
Open
Conversation
taejinchoi-cbnu
commented
May 15, 2026
Contributor
Author
There was a problem hiding this comment.
해당 파일의 경우 전체 미번역이고 /3-frames-and-windows 는 index.md만 번역된 미번역 챕터 같아 일단 충돌 마커만 지우고 commit에 전체 번역은 진행하지 않았습니다.
하지만 따로 번역은 진행해두어서 말씀해주시면 바로 commit 하겠습니다.
Contributor
Author
There was a problem hiding this comment.
05-17 세션에서 충돌 해결 후 파일 하나 번역 괜찮다고 하셔서 번역 진행 예정
Contributor
Author
|
@Turtle-Hwan 리뷰 부탁드립니다~ |
7 tasks
Turtle-Hwan
approved these changes
May 17, 2026
Contributor
Author
|
2-ui/4-forms-controls/3-events-change-input/article.md 의 ( - 옮긴이) 부분 논의 제외하고는 반영하겠습니다. 꼼꼼한 리뷰 감사합니다. |
taejinchoi-cbnu
commented
May 17, 2026
taejinchoi-cbnu
force-pushed
the
task2-clean
branch
from
01d7328 to
afe94e9
Compare
Contributor
Author
|
@Turtle-Hwan 코멘트 주신 내용 반영과 commit 정리 진행하였습니다. |
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.
요약
2회차 과제 C29 충돌 해결 완료하였습니다.
peer review 이후 진행 내용
2-ui/99-ui-misc/03-event-loop/article.md에 대한 충돌 해결 작업 완료수정 파일
2-ui/4-forms-controls/3-events-change-input/1-deposit-calculator/task.md2-ui/4-forms-controls/3-events-change-input/article.md2-ui/5-loading/01-onload-ondomcontentloaded/article.md2-ui/5-loading/02-script-async-defer/article.md3-frames-and-windows/01-popup-windows/article.md4-binary/02-text-decoder/article.md5-network/01-fetch/article.mdPull Request 체크리스트
TODO