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

fix: conflict #180

Merged
merged 117 commits into from
Nov 28, 2024
Merged

fix: conflict #180

merged 117 commits into from
Nov 28, 2024

Conversation

LEEJaeHyeok97
Copy link
Member

  • πŸ”€ PR 제λͺ©μ˜ ν˜•μ‹μ„ 잘 μž‘μ„±ν–ˆλ‚˜μš”? e.g. [feat] PR을 λ“±λ‘ν•œλ‹€.
  • πŸ’― ν…ŒμŠ€νŠΈλŠ” 잘 ν†΅κ³Όν–ˆλ‚˜μš”?
  • πŸ—οΈ λΉŒλ“œλŠ” μ„±κ³΅ν–ˆλ‚˜μš”?
  • 🧹 λΆˆν•„μš”ν•œ μ½”λ“œλŠ” μ œκ±°ν–ˆλ‚˜μš”?
  • πŸ’­ μ΄μŠˆλŠ” λ“±λ‘ν–ˆλ‚˜μš”?
  • 🏷️ 라벨은 λ“±λ‘ν–ˆλ‚˜μš”?

μž‘μ—… λ‚΄μš©

μ£Όμ˜μ‚¬ν•­

@LEEJaeHyeok97
feat: μž₯λ°”κ΅¬λ‹ˆ μΆ”κ°€ κΈ°λŠ₯ κ΅¬ν˜„
754b1c0
@LEEJaeHyeok97
Merge branch '9oormthon-univ:develop' into develop
9c2f259
@LEEJaeHyeok97
feat: μž₯λ°”κ΅¬λ‹ˆ 쑰회 κΈ°λŠ₯ κ΅¬ν˜„
b5de2ba
@LEEJaeHyeok97
Merge branch 'develop' of https://github.com/LEEJaeHyeok97/2024_DANPO…
ca6b405 
…ONG_TEAM_5_BE into develop
@LEEJaeHyeok97
Merge branch 'develop' into develop
5b563b5
@LEEJaeHyeok97
feat: μƒν’ˆ μ£Όλ¬Έκ³Ό μ‹κΆŒ μ‚¬μš© κΈ°λŠ₯ κ΅¬ν˜„
b4dbfe4
@LEEJaeHyeok97
Merge branch 'develop' of https://github.com/LEEJaeHyeok97/2024_DANPO…
fc50cd6 
…ONG_TEAM_5_BE into develop
@LEEJaeHyeok97
Merge branch 'develop' into develop
d97a8de
@LEEJaeHyeok97
style: ν¬μΈνŠΈνŠΈλžœμž­μ…˜ λ ˆν¬μ§€ν† λ¦¬λͺ… λ³€κ²½
74c8af5
@LEEJaeHyeok97
Merge branch 'develop' of https://github.com/LEEJaeHyeok97/2024_DANPO…
25cb8d0 
…ONG_TEAM_5_BE into develop
@LEEJaeHyeok97
Merge branch 'develop' into develop
4b89797
@LEEJaeHyeok97
Merge branch '9oormthon-univ:develop' into develop
5976f75
@LEEJaeHyeok97
deploy: 재배포
eae3903
@LEEJaeHyeok97
deploy: 재배포2
7e1ada5
@LEEJaeHyeok97
Merge branch '9oormthon-univ:develop' into develop
ca608fb
@LEEJaeHyeok97
deploy: 둜그인 둜직 μˆ˜μ •μ— λ”°λ₯Έ 재배포
63413e0
@LEEJaeHyeok97
deploy: 둜그인 둜직 μˆ˜μ •μ— λ”°λ₯Έ 재배포2
e20a015
@LEEJaeHyeok97
Merge branch '9oormthon-univ:develop' into develop
c627cc2
@LEEJaeHyeok97
Merge branch '9oormthon-univ:develop' into develop
9829a4b
@LEEJaeHyeok97
feat: μ‹κΆŒ μ‚¬μš© κΈ°λŠ₯ κ΅¬ν˜„
2f66ad9
@LEEJaeHyeok97
feat: yml μˆ˜μ • 사항 반영
163d698
@LEEJaeHyeok97
feat: μ‹κΆŒ μ‚¬μš© 둜직 μˆ˜μ •
3de7376
@LEEJaeHyeok97
Merge branch 'develop' into develop
ccc6df3
@LEEJaeHyeok97
feat: μ£Όλ¬Έ 둜직 μˆ˜μ • μ™„λ£Œ
f791988
@LEEJaeHyeok97
Merge branch 'develop' of https://github.com/LEEJaeHyeok97/2024_DANPO…
36965a7 
…ONG_TEAM_5_BE into develop
@LEEJaeHyeok97
fix: μž₯λ°”κ΅¬λ‹ˆμ— 아무것도 없을 λ•Œ μ£Όλ¬Έ μ‹œ active λ˜λŠ” ν˜„μƒ μˆ˜μ •
6bc0d02
@LEEJaeHyeok97
feat: μ£Όλ¬Έ μ™„λ£Œ μ‹œ 리턴 κ°’ μˆ˜μ •
7ae17ee
@LEEJaeHyeok97
Merge branch 'develop' into develop
9ca3a35
@LEEJaeHyeok97
Merge branch '9oormthon-univ:develop' into develop
2ffe327
@LEEJaeHyeok97
feat: λ‚΄ κ·Έλ£Ή 쑰회 κΈ°λŠ₯ κ΅¬ν˜„
e82f58c
@LEEJaeHyeok97
infra: cicd script μˆ˜μ •5
525bf16
@LEEJaeHyeok97
infra: cicd script μˆ˜μ •6
b096362
@LEEJaeHyeok97
infra: cicd script μˆ˜μ •7
bf19d26
@LEEJaeHyeok97
infra: cicd script μˆ˜μ •7
a54a681
@LEEJaeHyeok97
infra: cicd script μˆ˜μ •8
1218ffd
@LEEJaeHyeok97
infra: cicd script μˆ˜μ •9
1f1b075
@LEEJaeHyeok97
infra: cicd script μˆ˜μ •10
30ff013
@LEEJaeHyeok97
infra: cicd script μˆ˜μ •11
9465c6b
@LEEJaeHyeok97
infra: cicd script μˆ˜μ •12
7dbb131
@LEEJaeHyeok97
infra: cicd script μˆ˜μ •13
30714d3
@LEEJaeHyeok97
infra: cicd script μˆ˜μ •14
dc6994c
@LEEJaeHyeok97
infra: cicd script μˆ˜μ •15
91edd67
@LEEJaeHyeok97
infra: cicd script μˆ˜μ •16
337640b
@LEEJaeHyeok97
infra: cicd script μˆ˜μ •17
eb4ee46
@LEEJaeHyeok97
Merge branch '9oormthon-univ:develop' into develop
3b15052
@LEEJaeHyeok97
infra: cicd script μˆ˜μ •18
1ac7306
@LEEJaeHyeok97
Merge branch 'develop' of https://github.com/LEEJaeHyeok97/2024_DANPO…
983397a 
…ONG_TEAM_5_BE into develop
@LEEJaeHyeok97
infra: cicd script μˆ˜μ •19
0f74f33
@LEEJaeHyeok97
infra: cicd script μˆ˜μ •20
34c8a68
@LEEJaeHyeok97
infra: cicd script μˆ˜μ •21
0631975
@LEEJaeHyeok97
infra: cicd script μˆ˜μ •22
7820b6f
@LEEJaeHyeok97
fix: λ³΄μœ κΈˆμ•‘μ΄ μ„ κ²°μ œ κΈˆμ•‘λ³΄λ‹€ μž‘μ„ 경우 μƒνƒœκ°’ λ³€κ²½(200->400)
d0d8d7d
@LEEJaeHyeok97
feat: ν™ˆν™”λ©΄ κ°€κ²Œ 별 μ„ κ²°μ œ 디데이 μΆ”κ°€, 쿼리문 μ‘°μ •
5177685
@LEEJaeHyeok97
feat: μ£Όλ¬Έν•˜κΈ° 둜직 정상화
b1b37b6
@LEEJaeHyeok97
feat: μž₯λ°”κ΅¬λ‹ˆμ— λ‹€λ₯Έ κ°€κ²Œ 물건이 μžˆλŠ”μ§€ 검증 κ΅¬ν˜„
9bc9fb9
@LEEJaeHyeok97
feat: μž₯λ°”κ΅¬λ‹ˆ λΉ„μš°κΈ° κΈ°λŠ₯ κ΅¬ν˜„
9284a82
@LEEJaeHyeok97
deploy: cd retry
5a3e2c4
@LEEJaeHyeok97
feat: 맀μž₯ 상세 νŽ˜μ΄μ§€ 쑰회 메뉴 μ •λ ¬ 쑰건 μΆ”κ°€
ea9a295
@LEEJaeHyeok97
Merge branch 'develop' into develop
49ecad6
@LEEJaeHyeok97 LEEJaeHyeok97 merged commit ebc6565 into 9oormthon-univ:develop Nov 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@LEEJaeHyeok97