Skip to content

[문서] 1.6.7~1.7.2 충돌 해결 및 미번역분 번역#1870

Merged
Violet-Bora-Lee merged 7 commits into
javascript-tutorial:2026-en-mergefrom
meanzzi:fix/C18-meanzzi
Jun 7, 2026
Merged

[문서] 1.6.7~1.7.2 충돌 해결 및 미번역분 번역#1870
Violet-Bora-Lee merged 7 commits into
javascript-tutorial:2026-en-mergefrom
meanzzi:fix/C18-meanzzi

Conversation

@meanzzi

@meanzzi meanzzi commented May 17, 2026

Copy link
Copy Markdown

요약

C18 담당 파일 충돌 해결 및 번역 수정

  • 변경 파일

    • 1-js/06-advanced-functions/07-new-function/article.md
    • 1-js/06-advanced-functions/08-settimeout-setinterval/article.md
    • 1-js/06-advanced-functions/09-call-apply-decorators/article.md
    • 1-js/06-advanced-functions/10-bind/5-question-use-bind/solution.md
    • 1-js/06-advanced-functions/10-bind/article.md
    • 1-js/06-advanced-functions/12-arrow-functions/article.md
    • 1-js/07-object-properties/01-property-descriptors/article.md
    • 1-js/07-object-properties/02-property-accessors/article.md
  • 작업 내용

    • 충돌 마커 제거
    • upstream 영어 원문 변경사항 한국어에 반영

연관 이슈

(fix #일이삼)

Pull Request 체크리스트

TODO

  • 번역 규칙을 확인하셨나요?
    • 줄 바꿈과 단락을 '원문과 동일하게' 유지하셨나요?
    • 맞춤법 검사기로 맞춤법을 확인하셨나요?
    • 마크다운 문법에 사용되는 공백(스페이스), 큰따옴표("), 작은따옴표('), 대시(-), 백틱(`) 등의 특수문자는 그대로 두셨나요?
  • 로컬 서버 세팅 후 최종 결과물을 확인해 보셨나요?
  • PR 하나엔 번역문 하나만 넣으셨나요?
  • 의미 있는 커밋 메시지를 작성하셨나요?
    • 예시
      • [프락시] 번역
      • [프락시] 과제 번역
      • [if문과 조건부 연산자 '?'] 리뷰
      • [주석] 2차 리뷰
      • [Date 객체와 날짜] 번역

@CLAassistant

CLAassistant commented May 17, 2026

Copy link
Copy Markdown

CLA assistant check
All committers have signed the CLA.

@meanzzi

meanzzi commented May 17, 2026

Copy link
Copy Markdown
Author

안녕하세요! @wonza-hub 님 리뷰 부탁드립니다!

@wonza-hub wonza-hub left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

확인했습니다:)
커밋 별로 리뷰 및 의견 달아드렸습니다.
참고부탁드립니다.

@wonza-hub wonza-hub left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

리뷰 확인부탁드려요:)

Comment thread 1-js/06-advanced-functions/08-settimeout-setinterval/article.md Outdated
Comment thread 1-js/06-advanced-functions/08-settimeout-setinterval/article.md Outdated
Comment thread 1-js/06-advanced-functions/09-call-apply-decorators/article.md Outdated
Comment thread 1-js/06-advanced-functions/10-bind/article.md
Comment thread 1-js/06-advanced-functions/10-bind/article.md Outdated
Comment thread 1-js/07-object-properties/01-property-descriptors/article.md Outdated
Comment thread 1-js/07-object-properties/01-property-descriptors/article.md Outdated
Comment thread 1-js/07-object-properties/01-property-descriptors/article.md Outdated
Comment thread 1-js/07-object-properties/01-property-descriptors/article.md Outdated
Comment thread 1-js/07-object-properties/01-property-descriptors/article.md Outdated

@wonza-hub wonza-hub left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Part1 7.2 프로퍼티 getter와 setter 부분 확인했습니다.

@meanzzi meanzzi force-pushed the fix/C18-meanzzi branch from 6b0476d to 62b4912 Compare May 26, 2026 13:45
@Violet-Bora-Lee

Copy link
Copy Markdown
Member

@meanzzi 저장소 전체 관점에서 불필요한 커밋은 없애주시기 바랍니다.
작업 후 저 태그해주시면 바로 머지 진행할게요.

@meanzzi meanzzi changed the title [문서] 6.7~7.2 충돌 해결 및 미번역분 번역(C18) [문서] 1.6.7~1.7.2 충돌 해결 및 미번역분 번역 May 31, 2026
fix: Prettier 자동 포맷팅 되돌리기 및 충돌 재해결
@meanzzi meanzzi force-pushed the fix/C18-meanzzi branch from 62b4912 to c66d578 Compare May 31, 2026 12:39
@meanzzi

meanzzi commented May 31, 2026

Copy link
Copy Markdown
Author

@Violet-Bora-Lee 불필요한 커밋 수정하였습니다.

@Violet-Bora-Lee Violet-Bora-Lee merged commit c30c1d0 into javascript-tutorial:2026-en-merge Jun 7, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants