[정한샘] sprint 10#32
Open
koseha wants to merge 6 commits intocodeit-sprint-fullstack:express-정한샘from
Hidden character warning
The head ref may contain hidden characters: "express-\uc815\ud55c\uc0d8-sprint10"
Open
Conversation
Collaborator
|
잘 하셨습니다.
const year = targetDate.getFullYear(); |
Collaborator
브랜치를 어떻게 작업하신 건지 제가 잘 모르겠는데.. 선형적으로 작업하셨다면 merge conflict가 일어날 일은 없습니다. 만약 typescript 브랜치로 분기하여 작업하다가 다시 원본 브랜치로 돌아와 javascript 작업을 하신 것이라면, 좀 더 fast-forward 인 쪽을 직접 골라 conflict를 해결해 주셔야 합니다. 만약 한쪽이 명백히 최신 작업물이라면 VSCode의 accept all incoming, 혹은 accept all current 를 이용해 한꺼번에 처리해주시는 게 편리합니다. |
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
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.
요구사항
기본
심화
주요 변경사항
스크린샷
멘토에게