Skip to content

๐Ÿ’ป ํ”„๋กœ์ ํŠธ - ๋†€๋จน์ž

Notifications You must be signed in to change notification settings

giibeom/project-NMJ-renewal

Folders and files

NameName
Last commit message
Last commit date

Latest commit

ย 

History

20 Commits
ย 
ย 
ย 
ย 
ย 
ย 
ย 
ย 
ย 
ย 
ย 
ย 
ย 
ย 
ย 
ย 
ย 
ย 
ย 
ย 

Repository files navigation

๋†€(๊ณ ) ๋จน(๊ณ ) ์ž(๊ณ ) - Renewal

๊ฐœ์š”

์ฒ˜์Œ ๊ฐœ๋ฐœ์„ ๋ฐฐ์šด IT ํ•™์›์—์„œ ํŒ€์žฅ์„ ๋งก์œผ๋ฉฐ 5๋ช…์˜ ํŒ€์›๋“ค๊ณผ ํ•จ๊ป˜ 5์ฃผ๋™์•ˆ ๊ฐœ๋ฐœํ–ˆ๋˜ ๋†€๋จน์ž๋ผ๋Š” ์ž๋ฆฌ์˜ˆ์•ฝ ์„œ๋น„์Šค ํ”„๋กœ์ ํŠธ์ž…๋‹ˆ๋‹ค.
2๋…„ ๊ฐ„์˜ ์‹ค๋ฌด ๊ฒฝํ—˜๊ณผ, ์ตœ๊ทผ ํ•™์Šตํ•œ JPA์™€ TestCode๋ฅผ ์ ์šฉํ•ด๋ณด๋ฉฐ ์ •๋ฆฌํ•˜๊ธฐ ์œ„ํ•ด ๊ธฐ์กด ํ”„๋กœ์ ํŠธ๋ฅผ ์ƒˆ๋กœ ๋งŒ๋“ค์–ด๋ด…๋‹ˆ๋‹ค.


ํ”„๋กœ์ ํŠธ ๋ฆฌ๋ทฐ

๋ฐฑ๊ธฐ์„ ๋‹˜ ๋ผ์ด๋ธŒ ์ฝ”๋“œ ๋ฆฌ๋ทฐ


Github ์ „๋žต (Git Flow)

Branch ๊ตฌ์กฐ

|-- master
|   |-- hotfix
|   |   |-- issue-#885-user-deleted-error
|-- develop
|   |-- feat
|   |   |-- issue-#883-user-update
|   |   |-- issue-#884-user-delete
|   |-- refactor
|   |   |-- issue-#887-user-refactoring

Branch merge

merge ์‹œ ์ปค๋ฐ‹ scope์—๋Š” PR ๋ฒˆํ˜ธ๋ฅผ ๋„ฃ์Šต๋‹ˆ๋‹ค.

  • feat/refactor -> develop : Squash and Merge
    • merge commit message => feat(#2): ์‚ฌ์šฉ์ž ๋“ฑ๋ก ๊ธฐ๋Šฅ์„ ์ถ”๊ฐ€ํ•œ๋‹ค
  • hotfix -> main : Squash and Merge
    • merge commit message => fix(#2): ์˜ˆ์•ฝ ์‹œ ๋งค์žฅ ํšŒ์›์—๊ฒŒ ์Šน์ธ ์š”์ฒญ์ด ์•ˆ๊ฐ€๋Š” ์˜ค๋ฅ˜๋ฅผ ์ˆ˜์ •ํ•œ๋‹ค
  • develop -> main : Rebase and Merge
    • merge commit message => merge(#2): ๋ฐฑ์—”๋“œ ํ”„๋กœ์ ํŠธ๋ฅผ ์ƒ์„ฑํ•œ๋‹ค

Commit Convention

๋กœ์ปฌ์—์„œ์˜ ์ปค๋ฐ‹ scope์—๋Š” Issue ๋ฒˆํ˜ธ๋ฅผ ๋„ฃ์Šต๋‹ˆ๋‹ค.

ํƒ€์ž… ์„ค๋ช… ์˜ˆ์‹œ
merge PR merge merge(#2): ๋ฐฑ์—”๋“œ ํ”„๋กœ์ ํŠธ๋ฅผ ์ƒ์„ฑํ•œ๋‹ค
feat ์ƒˆ๋กœ์šด ๊ธฐ๋Šฅ ์ถ”๊ฐ€ feat(#3): ์‚ฌ์šฉ์ž ๋“ฑ๋ก ๊ธฐ๋Šฅ์„ ์ถ”๊ฐ€ํ•œ๋‹ค
fix ๋ฒ„๊ทธ ์ˆ˜์ • fix(#3): ์˜ˆ์•ฝ ์‹œ ๋งค์žฅ ํšŒ์›์—๊ฒŒ ์Šน์ธ ์š”์ฒญ์ด ์•ˆ๊ฐ€๋Š” ์˜ค๋ฅ˜๋ฅผ ์ˆ˜์ •ํ•œ๋‹ค
refactor ์ฝ”๋“œ ๋ฆฌํŒฉํ† ๋ง refactor(#3): ์˜ˆ์•ฝ ๋น„์ฆˆ๋‹ˆ์Šค ๋กœ์ง ๋ฆฌํŒฉํ† ๋ง์„ ์ง„ํ–‰ํ•œ๋‹ค
test ํ…Œ์ŠคํŠธ ์ฝ”๋“œ ์ž‘์„ฑ test(#3): ์˜ˆ์•ฝ ์‹คํŒจ ์ผ€์ด์Šค๋ฅผ ์ถ”๊ฐ€ํ•œ๋‹ค
docs ๋ฌธ์„œ ์ˆ˜์ • docs(#3): README์— ERD๋ฅผ ์ถ”๊ฐ€ํ•œ๋‹ค
chore ๋นŒ๋“œ ์—…๋ฌด, ํŒจํ‚ค์ง€ ๋งค๋‹ˆ์ € ์ˆ˜์ • ๋“ฑ (์†Œ์Šค ์ฝ”๋“œ ์™ธ์ ์ธ ์ž‘์—…) chore: PR ํ…œํ”Œ๋ฆฟ์„ ์ƒ์„ฑํ•œ๋‹ค

๋ฐ์ดํ„ฐ๋ฒ ์ด์Šค ERD

1์ฐจ ์Šคํ”„๋ฆฐํŠธ

About

๐Ÿ’ป ํ”„๋กœ์ ํŠธ - ๋†€๋จน์ž

Resources

Stars

Watchers

Forks

Releases

No releases published

Packages

No packages published

Languages