๐ŸŒณ Study Tree

๐Ÿฅณ ์Šคํ„ฐ๋”” ๋ชจ์ง‘์€ Study Tree์™€ ํ•จ๊ป˜!

image

๊ฐœ๋ฐœ๊ธฐ๊ฐ„: 2023.01.03 ~ 2023.02.03



๐ŸŽ Information

Study Tree๋Š” ์‰ฝ๊ฒŒ ์Šคํ„ฐ๋””๋ฅผ ๊ฐœ์„คํ•˜๊ณ , ๋งˆ์Œ์ด ๋งž๋Š” ์ด์šฉ์ž๋ฅผ ์‰ฝ๊ฒŒ ๋ชจ์„์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค !


๐Ÿ‘จโ€๐Ÿ‘ฉโ€๐Ÿ‘งโ€๐Ÿ‘ฆ Team Members

๊น€ํ˜„์šฐ(FE ํŒ€์žฅ) ์–‘๋‹ค๋นˆ (FE ํŒ€์›) ์ด๊ธฐ์™„ (FE ํŒ€์›) ๊น€์ฒ ํ˜„ (BE ํŒ€์›) ์‹ ์šฐ๊ฒฝ (BE ํŒ€์›) ์ตœ๋ฏผํ˜ (BE ํŒ€์›)
image image image imgage image image
@kimhw7 @vinyangda @LeeWang @lisia004 @kung036 @jackcmh1

๐ŸŒžTeam Rule

  • ๋งค์ผ 1์‹œ์— ์ „์ฒดํšŒ์˜๋ฅผ ์ง„ํ–‰ ํ•œ๋‹ค.
  • ํ”„๋กœ์ ํŠธ ๊ธฐ๊ฐ„ ๋™์•ˆ ํ‰์ผ 1์‹œ ~ ์˜คํ›„ 5์‹œ ์‚ฌ์ด์—๋Š” ์‘๋‹ต์„ 10๋ถ„ ์ด๋‚ด์— ํ•˜๋„๋ก ํ•œ๋‹ค.
  • ๋ชจ๋ฅด๋ฉด ํ˜ผ์ž ๊ณ ๋ฏผํ•˜์ง€ ์•Š๊ณ  ๊ฐ™์€ ํŒŒํŠธ ํŒ€์›์—๊ฒŒ๋ผ๋„ ์šฐ์„  ๊ณต์œ ํ•œ๋‹ค.
  • ์˜ค๋ฒ„ ์ปค๋ฎค๋‹ˆ์ผ€์ด์…˜์„ ์ง€ํ–ฅํ•œ๋‹ค.
  • ์ •ํ•œ ์ปจ๋ฒค์…˜์„ ์ค€์ˆ˜ํ•œ๋‹ค.
  • conflict ์—๋Ÿฌ๋ฅผ ๋ฐฉ์ง€ํ•˜๊ณ ์ž ๊ธฐ๋Šฅ๋ณ„๋กœ ์ž‘์—…์ด ๋๋‚˜๋ฉด github๋กœ push ๋ณด๋‚ธ๋‹ค.
  • ํ•˜๋ฃจ ํ•œ๋ฒˆ ์ด์ƒ commit์„ ์ง„ํ–‰ํ•œ๋‹ค

๐ŸŒŸ branch

strategy

  • main โ†’ dev โ†’ feat ์ˆœ์œผ๋กœ ๋ธŒ๋žœ์น˜ ์ƒ์„ฑ

branch types

  • main: ๋ฐฐํฌ ๋ธŒ๋žœ์น˜
  • dev : ๊ฐœ๋ฐœ ๋ธŒ๋žœ์น˜
  • feat/์ด๋‹ˆ์…œ/branchname : ๊ธฐ๋Šฅ ๋ธŒ๋žœ์น˜ (ex - feat/khw/login)
  • hotfix : ์˜ค๋ฅ˜ ๋˜๋Š” ๊ธด๊ธ‰ ์ˆ˜์ • ๋ธŒ๋žœ์น˜

feat๋ธŒ๋žœ์น˜ name style

  • ๊ธฐ๋Šฅ๋ณ„ ๋ธŒ๋žœ์น˜ ์ƒ์„ฑ, ๋‹ด๋‹น์ž ์ด๋‹ˆ์…œ ์ ๊ธฐ
  • ๊ธฐ๋Šฅ๋ณ„๋กœ ๋ธŒ๋žœ์น˜๋ฅผ ์ƒ์„ฑํ•˜๊ณ , 1๊ฐœ์˜ ๋ธŒ๋žœ์น˜๋Š” 1๋ช…์˜ ์‚ฌ์šฉ์ž๊ฐ€ ๋‹ด๋‹นํ•ฉ๋‹ˆ๋‹ค.

feat/๋‹ด๋‹น์ž/๊ธฐ๋Šฅ๋ช…

feat/khw/login
feat/lkw/logo

โœจGit Commit

structure

ํƒ€์ž… - #์ด์Šˆ๋ฒˆํ˜ธ : ์ œ๋ชฉ
(๊ณต๋ฐฑ์ค„)
์ƒ์„ธ ์„ค๋ช…

type

ํƒœ๊ทธ์ด๋ฆ„ ์„ค๋ช…
feat A new feature
fix A bug fix
docs Changes to documentation
refactor Refactoring production code
chore Updating build tasks, package manager configs, etc; no production code change

example

feat - #1 : ๋กœ๊ทธ์ธ html,css ์™„๋ฃŒ
๊ณตํ†ต ์ธํ’‹ ํ…์ŠคํŠธ, ๋ฒ„ํŠผ ์ปดํฌ๋„ŒํŠธ ์ ์šฉ

๐ŸŽ‰merge

  • github pull request๋ฅผ ์‚ฌ์šฉํ•ด mergeํ•ฉ๋‹ˆ๋‹ค. merge ํ›„ ๋ธŒ๋žœ์น˜๋Š” ์‚ญ์ œํ•ฉ๋‹ˆ๋‹ค.
  • ๊ฐœ๋ฐœ ์ค‘์—๋Š” squash merge ๋ฐฐํฌ ์‹œ์—๋Š” rebase merge ํ•ฉ๋‹ˆ๋‹ค.
  • front๊ฐœ๋ฐœ์€ ์ตœ์†Œ front 1๋ช…์„ ๋ฆฌ๋ทฐ์–ด๋กœ, back๊ฐœ๋ฐœ์€ ์ตœ์†Œ back 1๋ช…์„ ๋ฆฌ๋ทฐ์–ด๋กœ pull request ํ•ฉ๋‹ˆ๋‹ค.
  • front, back ๊ฐ™์ด ์ง„ํ–‰ํ•˜๋Š” ๊ฐœ๋ฐœ์€ ์ตœ์†Œ front,back ๊ฐ 1๋ช…์„ ๋ฆฌ๋ทฐ์–ด๋กœ pull request ํ•ฉ๋‹ˆ๋‹ค.