Skip to content

[문서] 1-06-03 advanced-functions 하위 일부 문서 충돌 과제 해결#1863

Open
jhroom wants to merge 4 commits into
javascript-tutorial:2026-en-mergefrom
jhroom:fix/c17-conflict
Open

[문서] 1-06-03 advanced-functions 하위 일부 문서 충돌 과제 해결#1863
jhroom wants to merge 4 commits into
javascript-tutorial:2026-en-mergefrom
jhroom:fix/c17-conflict

Conversation

@jhroom

@jhroom jhroom commented May 16, 2026

Copy link
Copy Markdown

요약

1-06-03 advanced-functions 하위 일부 문서의 동기화 충돌을 해결하고 누락된 번역 추가했습니다.

설명이 없는 파일은 단순 충돌 해결입니다

1-js/06-advanced-functions/03-closure/10-make-army/task.md

  • 추가된 주석 번역
  • 원문과 같은 단락 유지
  • 로컬서버 스크린샷 확인 스크린샷 2026-06-06 오후 8 00 42

1-js/06-advanced-functions/03-closure/5-function-in-if/task.md

1-js/06-advanced-functions/03-closure/7-let-scope/solution.md

1-js/06-advanced-functions/03-closure/article.md

1-js/06-advanced-functions/04-var/article.md

  • 충돌해결 및 추가된 원문 문장 번역
  • 로컬서버 스크린샷 확인 스크린샷 2026-06-06 오후 8 07 10 스크린샷 2026-06-06 오후 8 08 23 스크린샷 2026-06-06 오후 8 09 37

1-js/06-advanced-functions/05-global-object/article.md

  • globalThis 관한 내용을 원문에 맞게 변경
  • 로컬서버 확인 스크린샷 2026-06-06 오후 8 11 39 스크린샷 2026-06-06 오후 8 13 10 스크린샷 2026-06-06 오후 8 13 53

1-js/06-advanced-functions/06-function-object/5-sum-many-brackets/solution.md

1-js/06-advanced-functions/06-function-object/article.md

연관 이슈

Pull Request 체크리스트

TODO

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

@CLAassistant

CLAassistant commented May 16, 2026

Copy link
Copy Markdown

CLA assistant check
All committers have signed the CLA.

@jhroom

jhroom commented May 16, 2026

Copy link
Copy Markdown
Author

@meanzzi 리뷰 부탁드립니다

@meanzzi meanzzi 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.

제가 submit review를 안눌렀었네요.. 죄송합니다 ㅠㅠ 여기 부분 확인부탁드릴게요!

Comment thread 1-js/06-advanced-functions/03-closure/10-make-army/task.md
Comment thread 1-js/06-advanced-functions/04-var/article.md
Comment thread 1-js/06-advanced-functions/04-var/article.md
Comment thread 1-js/06-advanced-functions/05-global-object/article.md
Comment thread 1-js/06-advanced-functions/05-global-object/article.md
@javascript-translate-bot

Copy link
Copy Markdown

Please make the requested changes. After it, add a comment "/done".
Then I'll ask for a new review 👻

@javascript-translate-bot

Copy link
Copy Markdown

Please make the requested changes. After it, add a comment "/done".
Then I'll ask for a new review 👻

2 similar comments
@javascript-translate-bot

Copy link
Copy Markdown

Please make the requested changes. After it, add a comment "/done".
Then I'll ask for a new review 👻

@javascript-translate-bot

Copy link
Copy Markdown

Please make the requested changes. After it, add a comment "/done".
Then I'll ask for a new review 👻

@meanzzi meanzzi 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/04-var/article.md Outdated
Comment thread 1-js/06-advanced-functions/04-var/article.md Outdated

@meanzzi meanzzi 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.

확인했습니다!

@meanzzi

meanzzi commented May 17, 2026

Copy link
Copy Markdown

/done

@jhroom jhroom changed the title [문서] C17 충돌 과제 해결 [문서] advanced-functions 충돌 과제 해결 Jun 2, 2026
@jhroom jhroom force-pushed the fix/c17-conflict branch from 7ce8227 to c3c173d Compare June 6, 2026 11:52
@jhroom jhroom changed the title [문서] advanced-functions 충돌 과제 해결 [문서] 1-06-03 advanced-functions 하위 일부 문서 충돌 과제 해결 Jun 6, 2026
@jhroom

jhroom commented Jun 6, 2026

Copy link
Copy Markdown
Author

@Violet-Bora-Lee 커밋메세지 및 단위, pr내용 수정했습니다.

@jhroom jhroom force-pushed the fix/c17-conflict branch from c3c173d to 30c0c01 Compare June 7, 2026 10:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants