Conversation
4 tasks
jucheonsu
added a commit
that referenced
this pull request
Apr 15, 2026
jucheonsu
added a commit
that referenced
this pull request
Apr 15, 2026
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
2 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.
#️⃣ 연관된 이슈
📌 공유 사항
merge/#183브랜치에서origin/main을 병합해 dev-main 충돌을 선해결했습니다.ours(dev기준)으로 일괄 선택했습니다.dev -> mainPR을 이어서 진행합니다.✅ 체크리스트
📝 작업 내용
🔀 Merge
origin/main병합 및 충돌 121건 해결 (ours기준)[Merge] main 병합 충돌 해결 (dev 기준)💬 리뷰 요구사항