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.

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

dev 브랜치와 main 브랜치 충돌 해결 #244

Merged
merged 10 commits into from
Mar 22, 2024
Merged

Conversation

Sehee-Lee-01
Copy link
Member

@Sehee-Lee-01 Sehee-Lee-01 commented Mar 22, 2024

🎫 관련 이슈

✅ 구현 내용

  • dev 브랜치와 main 브랜치 충돌 해결

💬 코멘트

Sehee-Lee-01 and others added 10 commits February 6, 2024 20:31
프로덕션 서버 구축 (merge dev into main)
dev 브랜치를 main 브랜치에 반영
Hotfix CORS 에러 해결
OAuth 로그인 시 리다이렉트 url이 올바르지 않은 오류 해결을 위한 dev -> prod merge
oauth 관련 설정 변경
# Conflicts:
#	sidepeek_backend_secret
@Sehee-Lee-01 Sehee-Lee-01 self-assigned this Mar 22, 2024
@Sehee-Lee-01 Sehee-Lee-01 changed the title Chore/dev merge test dev 브랜치와 main 브랜치 충돌 해결 Mar 22, 2024
@Sehee-Lee-01 Sehee-Lee-01 added ⚙️ 세팅했슈 환경 세팅 ✅ 테스트혀봤슈 빌드&테스트가 필요할 때 태그 labels Mar 22, 2024
Copy link

📝 Jacoco Test Coverage

Overall Project 67.23%

There is no coverage information present for the Files changed

@Sehee-Lee-01 Sehee-Lee-01 merged commit 30c5624 into dev Mar 22, 2024
3 checks passed
@Sehee-Lee-01 Sehee-Lee-01 deleted the chore/dev-merge-test branch March 22, 2024 10:10
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.

2 participants