Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[HOTFIX] develop 충돌 해결 과정에서의 timeBlockId 삭제 에러 해결 #231

Merged
merged 1 commit into from
Jul 19, 2024
Merged

[HOTFIX] develop 충돌 해결 과정에서의 timeBlockId 삭제 에러 해결 #231

merged 1 commit into from
Jul 19, 2024

Conversation

Kjiw0n
Copy link
Contributor

@Kjiw0n Kjiw0n commented Jul 19, 2024

작업 내용 🧑‍💻

  • develop 충돌 해결 과정에서의 timeBlockId 삭제 에러 해결
  • 충돌 해결 과정에서 삭제 id 시 timeBlockId 를 넘겨받지 못하는 오류가 생겼습니다.. 수정된 processEvents에 맞게 각 id의 상태를 다시 추가하여 해당 오류 수정하였습니다!

알게된 점 🚀

기록하며 개발하기!

  • 충돌 해결 시 유의하자.

리뷰 요구사항 💬

리뷰어가 특별히 봐주었으면 하는 부분이 있다면 작성해주세요

  • TimeBlock 생성, 수정, 삭제 기능 한번씩 확인부탁드립니다.

관련 이슈

close #228

스크린샷 (선택)

Jul-19-2024 16-55-43

@Kjiw0n Kjiw0n self-assigned this Jul 19, 2024
seong-hui
seong-hui approved these changes Jul 19, 2024
View reviewed changes
Copy link
Member

@seong-hui seong-hui left a comment

Choose a reason for hiding this comment

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

수정사항 확인했습니다! LGTM 👍

jeeminyi
jeeminyi approved these changes Jul 19, 2024
View reviewed changes
Copy link
Member

@jeeminyi jeeminyi left a comment

Choose a reason for hiding this comment

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

수고 많으셨습니다! 개큰 어푸어푸

@Kjiw0n Kjiw0n merged commit 4fafe32 into develop Jul 19, 2024
2 checks passed
@Kjiw0n Kjiw0n deleted the hotfix/#228-timeblock-delete-error branch July 19, 2024 08:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jeeminyi jeeminyi jeeminyi approved these changes

@seong-hui seong-hui seong-hui approved these changes

@wrryu09 wrryu09 Awaiting requested review from wrryu09

Assignees

@Kjiw0n Kjiw0n

Labels
에러 수정 🍀 지원 🔗 api 연결
Projects
@DAWM-FE
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[HOTFIX] 충돌 해결 과정에서 Task 타임블로킹 삭제 에러 수정
3 participants
@Kjiw0n @seong-hui @jeeminyi