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/#35] merge conflict 꼬임 해결 #36

Merged
merged 1 commit into from
Jan 22, 2025
Merged

[Hotfix/#35] merge conflict 꼬임 해결 #36

merged 1 commit into from
Jan 22, 2025

Conversation

Eonji-sw
Copy link
Member

✅ 𝗖𝗵𝗲𝗰𝗸-𝗟𝗶𝘀𝘁

  • merge할 브랜치의 위치를 확인해 주세요.(main❌/develop⭕)
  • 리뷰가 필요한 경우 리뷰어를 지정해 주세요.
  • 리뷰는 PR이 올라오면 최대한 빠르게 진행합니다.
  • P1 단계의 리뷰는 빠르게 확인 후 반영합니다.
  • Approve된 PR은 assigner가 머지하고, 수정 요청이 온 경우 수정 후 다시 push를 합니다.

📌 𝗜𝘀𝘀𝘂𝗲𝘀

📎 𝗪𝗼𝗿𝗸 𝗗𝗲𝘀𝗰𝗿𝗶𝗽𝘁𝗶𝗼𝗻

  • typo 꼬임 이슈 해결

📷 𝗦𝗰𝗿𝗲𝗲𝗻𝘀𝗵𝗼𝘁

💬 𝗧𝗼 𝗥𝗲𝘃𝗶𝗲𝘄𝗲𝗿𝘀

별건 아니예요 걍 어푸 ㄱㄱ

@Eonji-sw Eonji-sw added 🚑️ [HOTFIX] 이슈나 QA에서 발생된 급하게 해결해야 될 문제 🍀 언지 먼지 labels Jan 22, 2025
@Eonji-sw Eonji-sw self-assigned this Jan 22, 2025
@Eonji-sw Eonji-sw requested a review from a team as a code owner January 22, 2025 11:28
@Eonji-sw Eonji-sw changed the title [#35/HOTFIX] merge conflict 꼬임 해결 [HOTFIX/#35] merge conflict 꼬임 해결 Jan 22, 2025
@Eonji-sw Eonji-sw changed the title [HOTFIX/#35] merge conflict 꼬임 해결 [Hotfix/#35] merge conflict 꼬임 해결 Jan 22, 2025
youjin09222
youjin09222 approved these changes Jan 22, 2025
View reviewed changes
Copy link
Contributor

@youjin09222 youjin09222 left a comment

Choose a reason for hiding this comment

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

👍👍

@Eonji-sw Eonji-sw merged commit 12b8380 into develop Jan 22, 2025
1 check passed
@Eonji-sw Eonji-sw deleted the feature/#35-merge-conflict-fix branch January 22, 2025 11:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@youjin09222 youjin09222 youjin09222 approved these changes

@gaeulzzang gaeulzzang gaeulzzang approved these changes

Assignees

@Eonji-sw Eonji-sw

Labels
🍀 언지 먼지 🚑️ [HOTFIX] 이슈나 QA에서 발생된 급하게 해결해야 될 문제
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[HOTFIX] : merge conflict 꼬임 해결
3 participants
@Eonji-sw @youjin09222 @gaeulzzang