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

merge: conflict problem #153

Merged
merged 80 commits into from
Nov 25, 2024
Merged

Conversation

LEEJaeHyeok97
Copy link
Member

  • ๐Ÿ”€ PR ์ œ๋ชฉ์˜ ํ˜•์‹์„ ์ž˜ ์ž‘์„ฑํ–ˆ๋‚˜์š”? e.g. [feat] PR์„ ๋“ฑ๋กํ•œ๋‹ค.
  • ๐Ÿ’ฏ ํ…Œ์ŠคํŠธ๋Š” ์ž˜ ํ†ต๊ณผํ–ˆ๋‚˜์š”?
  • ๐Ÿ—๏ธ ๋นŒ๋“œ๋Š” ์„ฑ๊ณตํ–ˆ๋‚˜์š”?
  • ๐Ÿงน ๋ถˆํ•„์š”ํ•œ ์ฝ”๋“œ๋Š” ์ œ๊ฑฐํ–ˆ๋‚˜์š”?
  • ๐Ÿ’ญ ์ด์Šˆ๋Š” ๋“ฑ๋กํ–ˆ๋‚˜์š”?
  • ๐Ÿท๏ธ ๋ผ๋ฒจ์€ ๋“ฑ๋กํ–ˆ๋‚˜์š”?

์ž‘์—… ๋‚ด์šฉ

์ฃผ์˜์‚ฌํ•ญ

@LEEJaeHyeok97 LEEJaeHyeok97 merged commit 6c441c3 into 9oormthon-univ:develop Nov 25, 2024
LEEJaeHyeok97 added a commit that referenced this pull request Nov 25, 2024
* feat: ์žฅ๋ฐ”๊ตฌ๋‹ˆ ์ถ”๊ฐ€ ๊ธฐ๋Šฅ ๊ตฌํ˜„

* feat: ์žฅ๋ฐ”๊ตฌ๋‹ˆ ์กฐํšŒ ๊ธฐ๋Šฅ ๊ตฌํ˜„

* feat: ์ƒํ’ˆ ์ฃผ๋ฌธ๊ณผ ์‹๊ถŒ ์‚ฌ์šฉ ๊ธฐ๋Šฅ ๊ตฌํ˜„

* style: ํฌ์ธํŠธํŠธ๋žœ์žญ์…˜ ๋ ˆํฌ์ง€ํ† ๋ฆฌ๋ช… ๋ณ€๊ฒฝ

* deploy: ์žฌ๋ฐฐํฌ

* deploy: ์žฌ๋ฐฐํฌ2

* deploy: ๋กœ๊ทธ์ธ ๋กœ์ง ์ˆ˜์ •์— ๋”ฐ๋ฅธ ์žฌ๋ฐฐํฌ

* deploy: ๋กœ๊ทธ์ธ ๋กœ์ง ์ˆ˜์ •์— ๋”ฐ๋ฅธ ์žฌ๋ฐฐํฌ2

* feat: ์‹๊ถŒ ์‚ฌ์šฉ ๊ธฐ๋Šฅ ๊ตฌํ˜„

* feat: yml ์ˆ˜์ • ์‚ฌํ•ญ ๋ฐ˜์˜

* feat: ์‹๊ถŒ ์‚ฌ์šฉ ๋กœ์ง ์ˆ˜์ •

* feat: ์ฃผ๋ฌธ ๋กœ์ง ์ˆ˜์ • ์™„๋ฃŒ

* fix: ์žฅ๋ฐ”๊ตฌ๋‹ˆ์— ์•„๋ฌด๊ฒƒ๋„ ์—†์„ ๋•Œ ์ฃผ๋ฌธ ์‹œ active ๋˜๋Š” ํ˜„์ƒ ์ˆ˜์ •

* feat: ์ฃผ๋ฌธ ์™„๋ฃŒ ์‹œ ๋ฆฌํ„ด ๊ฐ’ ์ˆ˜์ •

* feat: ๋‚ด ๊ทธ๋ฃน ์กฐํšŒ ๊ธฐ๋Šฅ ๊ตฌํ˜„

* feat: ๊ธฐ๋ณธ ํ”„๋กœํ•„ ์ด๋ฏธ์ง€ url ์ถ”๊ฐ€

* feat: ๊ทธ๋ฃน ๋ฉค๋ฒ„ ์ „์ฒด ์กฐํšŒ ๊ธฐ๋Šฅ ๊ตฌํ˜„

* feat: 1์ธ๋‹น ์‚ฌ์šฉ ๊ฐ€๋Šฅ ๊ธˆ์•ก ์„ค์ • ์ปฌ๋Ÿผ ์ถ”๊ฐ€

* feat: ๋‚ด ์ง€๊ฐ‘ ์กฐํšŒ ๊ธฐ๋Šฅ ๊ตฌํ˜„

* feat: ์„ ๊ฒฐ์ œ ๊ธฐ๋Šฅ ๊ตฌํ˜„

* feat: ์œ ์ € ํ™ˆ ํ™”๋ฉด ์กฐํšŒ ๊ธฐ๋Šฅ ๊ตฌํ˜„

* feat: ๊ทธ๋ฃน ์ƒ์„ธ ์กฐํšŒ ๊ธฐ๋Šฅ ๊ตฌํ˜„

* feat: ๊ฐ€๊ฒŒ ์ƒ์„ธ ์กฐํšŒ ์ฟผ๋ฆฌ ์ˆ˜์ •

* deploy: ๋ณ€๊ฒฝ์‚ฌํ•ญ ๋ฐ˜์˜์„ ์œ„ํ•œ ์ปค๋ฐ‹

* deploy: ์ˆ˜์ • ์‚ฌํ•ญ ๋ฐ˜์˜ ์žฌ๋ฐฐํฌ

* deploy: rds ๊ต์ฒด๋กœ ์ธํ•œ ์žฌ๋ฐฐํฌ

* deploy: rds ๊ต์ฒด๋กœ ์ธํ•œ ์žฌ๋ฐฐํฌ2

* feat: ํ™ˆ ํ™”๋ฉด ์†Œ์†ํŒ€ ์กฐํšŒ ์ฟผ๋ฆฌ ์ œ๋Œ€๋กœ ์•ˆ๋˜๋˜ ํ˜„์ƒ ํ•ด๊ฒฐ, ๋Œ€ํ‘œ์ด๋ฏธ์ง€ ๋ฐ˜ํ™˜ ์ถ”๊ฐ€

* feat: ๊ทธ๋ฃน ์ƒ์„ธ ์กฐํšŒ ์‘๋‹ต ์ปฌ๋Ÿผ๋ช… ๋ณ€๊ฒฝ

* feat: memberLimit ์ปฌ๋Ÿผ ์‚ญ์ œ

* feat: ์„ ๊ฒฐ์ œ ์‹œ ๊ธฐ์กด ๊ฒฐ์ œ ๋‚ด์—ญ๊ณผ ๋ฉฑ๋“ฑ์„ฑ ๋ฌธ์ œ ํ•ด๊ฒฐ

* fix: ํŒ€ ์ƒ์„ธ ์กฐํšŒ ์‹œ ์ด๋ฏธ์ง€ ์ฟผ๋ฆฌ๊ฐ€ ์˜๋ฏธ ์—†์ด join ๋˜๋˜ ์ฟผ๋ฆฌ ์ˆ˜์ •

* feat: ๊ฐ€๊ฒŒ ๊ฒ€์ƒ‰ ๊ธฐ๋Šฅ ๋Œ€ํญ ์ˆ˜์ •

* feat: ํ”„๋ก ํŠธ ์š”๊ตฌ์‚ฌ ๋ฐ˜์˜

* feat: searchcondition ์‚ญ์ œ

* feat: ํŒ€ํƒ€์ž… desription ๋ฆฌํ„ด ํ•˜๋„๋ก ์ˆ˜์ •

* feat: ์นดํ…Œ๊ณ ๋ฆฌ๋ณ„ ํŒ€ ์กฐํšŒ ์‹œ ํŒ€ ์ƒ์„ฑ์ผ ์ปฌ๋Ÿผ ์ถ”๊ฐ€

* feat: ๋งค์žฅ์ฐพ๊ธฐ_์ƒ์„ธ ํŽ˜์ด์ง€ ์กฐํšŒ ๊ธฐ๋Šฅ ๊ตฌํ˜„

* feat: ๋น„๋ฐ€ ์ฝ”๋“œ ์กฐํšŒ ๊ธฐ๋Šฅ ์—”๋“œ ํฌ์ธํŠธ ์ˆ˜์ •

* fix: conflict fix

* hotfix: ์„œ๋ฒ„ ๋ณต๊ตฌ

* hotfix: ์„œ๋ฒ„ ๋ณต๊ตฌ2
LEEJaeHyeok97 added a commit that referenced this pull request Nov 26, 2024
* merge: conflict problem (#153)

* feat: ์žฅ๋ฐ”๊ตฌ๋‹ˆ ์ถ”๊ฐ€ ๊ธฐ๋Šฅ ๊ตฌํ˜„

* feat: ์žฅ๋ฐ”๊ตฌ๋‹ˆ ์กฐํšŒ ๊ธฐ๋Šฅ ๊ตฌํ˜„

* feat: ์ƒํ’ˆ ์ฃผ๋ฌธ๊ณผ ์‹๊ถŒ ์‚ฌ์šฉ ๊ธฐ๋Šฅ ๊ตฌํ˜„

* style: ํฌ์ธํŠธํŠธ๋žœ์žญ์…˜ ๋ ˆํฌ์ง€ํ† ๋ฆฌ๋ช… ๋ณ€๊ฒฝ

* deploy: ์žฌ๋ฐฐํฌ

* deploy: ์žฌ๋ฐฐํฌ2

* deploy: ๋กœ๊ทธ์ธ ๋กœ์ง ์ˆ˜์ •์— ๋”ฐ๋ฅธ ์žฌ๋ฐฐํฌ

* deploy: ๋กœ๊ทธ์ธ ๋กœ์ง ์ˆ˜์ •์— ๋”ฐ๋ฅธ ์žฌ๋ฐฐํฌ2

* feat: ์‹๊ถŒ ์‚ฌ์šฉ ๊ธฐ๋Šฅ ๊ตฌํ˜„

* feat: yml ์ˆ˜์ • ์‚ฌํ•ญ ๋ฐ˜์˜

* feat: ์‹๊ถŒ ์‚ฌ์šฉ ๋กœ์ง ์ˆ˜์ •

* feat: ์ฃผ๋ฌธ ๋กœ์ง ์ˆ˜์ • ์™„๋ฃŒ

* fix: ์žฅ๋ฐ”๊ตฌ๋‹ˆ์— ์•„๋ฌด๊ฒƒ๋„ ์—†์„ ๋•Œ ์ฃผ๋ฌธ ์‹œ active ๋˜๋Š” ํ˜„์ƒ ์ˆ˜์ •

* feat: ์ฃผ๋ฌธ ์™„๋ฃŒ ์‹œ ๋ฆฌํ„ด ๊ฐ’ ์ˆ˜์ •

* feat: ๋‚ด ๊ทธ๋ฃน ์กฐํšŒ ๊ธฐ๋Šฅ ๊ตฌํ˜„

* feat: ๊ธฐ๋ณธ ํ”„๋กœํ•„ ์ด๋ฏธ์ง€ url ์ถ”๊ฐ€

* feat: ๊ทธ๋ฃน ๋ฉค๋ฒ„ ์ „์ฒด ์กฐํšŒ ๊ธฐ๋Šฅ ๊ตฌํ˜„

* feat: 1์ธ๋‹น ์‚ฌ์šฉ ๊ฐ€๋Šฅ ๊ธˆ์•ก ์„ค์ • ์ปฌ๋Ÿผ ์ถ”๊ฐ€

* feat: ๋‚ด ์ง€๊ฐ‘ ์กฐํšŒ ๊ธฐ๋Šฅ ๊ตฌํ˜„

* feat: ์„ ๊ฒฐ์ œ ๊ธฐ๋Šฅ ๊ตฌํ˜„

* feat: ์œ ์ € ํ™ˆ ํ™”๋ฉด ์กฐํšŒ ๊ธฐ๋Šฅ ๊ตฌํ˜„

* feat: ๊ทธ๋ฃน ์ƒ์„ธ ์กฐํšŒ ๊ธฐ๋Šฅ ๊ตฌํ˜„

* feat: ๊ฐ€๊ฒŒ ์ƒ์„ธ ์กฐํšŒ ์ฟผ๋ฆฌ ์ˆ˜์ •

* deploy: ๋ณ€๊ฒฝ์‚ฌํ•ญ ๋ฐ˜์˜์„ ์œ„ํ•œ ์ปค๋ฐ‹

* deploy: ์ˆ˜์ • ์‚ฌํ•ญ ๋ฐ˜์˜ ์žฌ๋ฐฐํฌ

* deploy: rds ๊ต์ฒด๋กœ ์ธํ•œ ์žฌ๋ฐฐํฌ

* deploy: rds ๊ต์ฒด๋กœ ์ธํ•œ ์žฌ๋ฐฐํฌ2

* feat: ํ™ˆ ํ™”๋ฉด ์†Œ์†ํŒ€ ์กฐํšŒ ์ฟผ๋ฆฌ ์ œ๋Œ€๋กœ ์•ˆ๋˜๋˜ ํ˜„์ƒ ํ•ด๊ฒฐ, ๋Œ€ํ‘œ์ด๋ฏธ์ง€ ๋ฐ˜ํ™˜ ์ถ”๊ฐ€

* feat: ๊ทธ๋ฃน ์ƒ์„ธ ์กฐํšŒ ์‘๋‹ต ์ปฌ๋Ÿผ๋ช… ๋ณ€๊ฒฝ

* feat: memberLimit ์ปฌ๋Ÿผ ์‚ญ์ œ

* feat: ์„ ๊ฒฐ์ œ ์‹œ ๊ธฐ์กด ๊ฒฐ์ œ ๋‚ด์—ญ๊ณผ ๋ฉฑ๋“ฑ์„ฑ ๋ฌธ์ œ ํ•ด๊ฒฐ

* fix: ํŒ€ ์ƒ์„ธ ์กฐํšŒ ์‹œ ์ด๋ฏธ์ง€ ์ฟผ๋ฆฌ๊ฐ€ ์˜๋ฏธ ์—†์ด join ๋˜๋˜ ์ฟผ๋ฆฌ ์ˆ˜์ •

* feat: ๊ฐ€๊ฒŒ ๊ฒ€์ƒ‰ ๊ธฐ๋Šฅ ๋Œ€ํญ ์ˆ˜์ •

* feat: ํ”„๋ก ํŠธ ์š”๊ตฌ์‚ฌ ๋ฐ˜์˜

* feat: searchcondition ์‚ญ์ œ

* feat: ํŒ€ํƒ€์ž… desription ๋ฆฌํ„ด ํ•˜๋„๋ก ์ˆ˜์ •

* feat: ์นดํ…Œ๊ณ ๋ฆฌ๋ณ„ ํŒ€ ์กฐํšŒ ์‹œ ํŒ€ ์ƒ์„ฑ์ผ ์ปฌ๋Ÿผ ์ถ”๊ฐ€

* feat: ๋งค์žฅ์ฐพ๊ธฐ_์ƒ์„ธ ํŽ˜์ด์ง€ ์กฐํšŒ ๊ธฐ๋Šฅ ๊ตฌํ˜„

* feat: ๋น„๋ฐ€ ์ฝ”๋“œ ์กฐํšŒ ๊ธฐ๋Šฅ ์—”๋“œ ํฌ์ธํŠธ ์ˆ˜์ •

* fix: conflict fix

* hotfix: ์„œ๋ฒ„ ๋ณต๊ตฌ

* hotfix: ์„œ๋ฒ„ ๋ณต๊ตฌ2

* feat: Barobill api ์—ฐ๋™ (#155)

* feat: ์žฅ๋ฐ”๊ตฌ๋‹ˆ ์ถ”๊ฐ€ ๊ธฐ๋Šฅ ๊ตฌํ˜„

* feat: ์žฅ๋ฐ”๊ตฌ๋‹ˆ ์กฐํšŒ ๊ธฐ๋Šฅ ๊ตฌํ˜„

* feat: ์ƒํ’ˆ ์ฃผ๋ฌธ๊ณผ ์‹๊ถŒ ์‚ฌ์šฉ ๊ธฐ๋Šฅ ๊ตฌํ˜„

* style: ํฌ์ธํŠธํŠธ๋žœ์žญ์…˜ ๋ ˆํฌ์ง€ํ† ๋ฆฌ๋ช… ๋ณ€๊ฒฝ

* deploy: ์žฌ๋ฐฐํฌ

* deploy: ์žฌ๋ฐฐํฌ2

* deploy: ๋กœ๊ทธ์ธ ๋กœ์ง ์ˆ˜์ •์— ๋”ฐ๋ฅธ ์žฌ๋ฐฐํฌ

* deploy: ๋กœ๊ทธ์ธ ๋กœ์ง ์ˆ˜์ •์— ๋”ฐ๋ฅธ ์žฌ๋ฐฐํฌ2

* feat: ์‹๊ถŒ ์‚ฌ์šฉ ๊ธฐ๋Šฅ ๊ตฌํ˜„

* feat: yml ์ˆ˜์ • ์‚ฌํ•ญ ๋ฐ˜์˜

* feat: ์‹๊ถŒ ์‚ฌ์šฉ ๋กœ์ง ์ˆ˜์ •

* feat: ์ฃผ๋ฌธ ๋กœ์ง ์ˆ˜์ • ์™„๋ฃŒ

* fix: ์žฅ๋ฐ”๊ตฌ๋‹ˆ์— ์•„๋ฌด๊ฒƒ๋„ ์—†์„ ๋•Œ ์ฃผ๋ฌธ ์‹œ active ๋˜๋Š” ํ˜„์ƒ ์ˆ˜์ •

* feat: ์ฃผ๋ฌธ ์™„๋ฃŒ ์‹œ ๋ฆฌํ„ด ๊ฐ’ ์ˆ˜์ •

* feat: ๋‚ด ๊ทธ๋ฃน ์กฐํšŒ ๊ธฐ๋Šฅ ๊ตฌํ˜„

* feat: ๊ธฐ๋ณธ ํ”„๋กœํ•„ ์ด๋ฏธ์ง€ url ์ถ”๊ฐ€

* feat: ๊ทธ๋ฃน ๋ฉค๋ฒ„ ์ „์ฒด ์กฐํšŒ ๊ธฐ๋Šฅ ๊ตฌํ˜„

* feat: 1์ธ๋‹น ์‚ฌ์šฉ ๊ฐ€๋Šฅ ๊ธˆ์•ก ์„ค์ • ์ปฌ๋Ÿผ ์ถ”๊ฐ€

* feat: ๋‚ด ์ง€๊ฐ‘ ์กฐํšŒ ๊ธฐ๋Šฅ ๊ตฌํ˜„

* feat: ์„ ๊ฒฐ์ œ ๊ธฐ๋Šฅ ๊ตฌํ˜„

* feat: ์œ ์ € ํ™ˆ ํ™”๋ฉด ์กฐํšŒ ๊ธฐ๋Šฅ ๊ตฌํ˜„

* feat: ๊ทธ๋ฃน ์ƒ์„ธ ์กฐํšŒ ๊ธฐ๋Šฅ ๊ตฌํ˜„

* feat: ๊ฐ€๊ฒŒ ์ƒ์„ธ ์กฐํšŒ ์ฟผ๋ฆฌ ์ˆ˜์ •

* deploy: ๋ณ€๊ฒฝ์‚ฌํ•ญ ๋ฐ˜์˜์„ ์œ„ํ•œ ์ปค๋ฐ‹

* deploy: ์ˆ˜์ • ์‚ฌํ•ญ ๋ฐ˜์˜ ์žฌ๋ฐฐํฌ

* deploy: rds ๊ต์ฒด๋กœ ์ธํ•œ ์žฌ๋ฐฐํฌ

* deploy: rds ๊ต์ฒด๋กœ ์ธํ•œ ์žฌ๋ฐฐํฌ2

* feat: ํ™ˆ ํ™”๋ฉด ์†Œ์†ํŒ€ ์กฐํšŒ ์ฟผ๋ฆฌ ์ œ๋Œ€๋กœ ์•ˆ๋˜๋˜ ํ˜„์ƒ ํ•ด๊ฒฐ, ๋Œ€ํ‘œ์ด๋ฏธ์ง€ ๋ฐ˜ํ™˜ ์ถ”๊ฐ€

* feat: ๊ทธ๋ฃน ์ƒ์„ธ ์กฐํšŒ ์‘๋‹ต ์ปฌ๋Ÿผ๋ช… ๋ณ€๊ฒฝ

* feat: memberLimit ์ปฌ๋Ÿผ ์‚ญ์ œ

* feat: ์„ ๊ฒฐ์ œ ์‹œ ๊ธฐ์กด ๊ฒฐ์ œ ๋‚ด์—ญ๊ณผ ๋ฉฑ๋“ฑ์„ฑ ๋ฌธ์ œ ํ•ด๊ฒฐ

* fix: ํŒ€ ์ƒ์„ธ ์กฐํšŒ ์‹œ ์ด๋ฏธ์ง€ ์ฟผ๋ฆฌ๊ฐ€ ์˜๋ฏธ ์—†์ด join ๋˜๋˜ ์ฟผ๋ฆฌ ์ˆ˜์ •

* feat: ๊ฐ€๊ฒŒ ๊ฒ€์ƒ‰ ๊ธฐ๋Šฅ ๋Œ€ํญ ์ˆ˜์ •

* feat: ํ”„๋ก ํŠธ ์š”๊ตฌ์‚ฌ ๋ฐ˜์˜

* feat: searchcondition ์‚ญ์ œ

* feat: ํŒ€ํƒ€์ž… desription ๋ฆฌํ„ด ํ•˜๋„๋ก ์ˆ˜์ •

* feat: ์นดํ…Œ๊ณ ๋ฆฌ๋ณ„ ํŒ€ ์กฐํšŒ ์‹œ ํŒ€ ์ƒ์„ฑ์ผ ์ปฌ๋Ÿผ ์ถ”๊ฐ€

* feat: ๋งค์žฅ์ฐพ๊ธฐ_์ƒ์„ธ ํŽ˜์ด์ง€ ์กฐํšŒ ๊ธฐ๋Šฅ ๊ตฌํ˜„

* feat: ๋น„๋ฐ€ ์ฝ”๋“œ ์กฐํšŒ ๊ธฐ๋Šฅ ์—”๋“œ ํฌ์ธํŠธ ์ˆ˜์ •

* fix: conflict fix

* hotfix: ์„œ๋ฒ„ ๋ณต๊ตฌ

* hotfix: ์„œ๋ฒ„ ๋ณต๊ตฌ2

* feat: Barobill api ์—ฐ๋™
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant