Skip to content
@TEAM2-FORCE

TEAM2-FORCE

README.md

๐Ÿธํ•ด์ปคํ†ค 2ํŒ€ - ๊ธฐ์„ธ(FORCE)๐Ÿธ

๐Ÿ™‹โ€โ™€๏ธ๊ฐœ๋ฐœ ๊ทœ์น™

๐Ÿ‘ฉโ€๐Ÿ’ป์ปค๋ฐ‹ ์ปจ๋ฒค์…˜

  • feat: ์ƒˆ๋กœ์šด ๊ธฐ๋Šฅ ์ถ”๊ฐ€
  • fix: ๋ฒ„๊ทธ ์ˆ˜์ •
  • docs: ๋ฌธ์„œ ์ˆ˜์ •
  • style: ์ฝ”๋“œ ํฌ๋งทํŒ…, ์„ธ๋ฏธ์ฝœ๋ก  ๋ˆ„๋ฝ, ์ฝ”๋“œ ๋ณ€๊ฒฝ์ด ์—†๋Š” ๊ฒฝ์šฐ
  • refactor: ์ฝ”๋“œ ๋ฆฌํŽ™ํ† ๋ง
  • test: ํ…Œ์ŠคํŠธ ์ฝ”๋“œ, ๋ฆฌํŽ™ํ† ๋ง ํ…Œ์ŠคํŠธ ์ฝ”๋“œ ์ถ”๊ฐ€
  • chore: ๋นŒ๋“œ ์—…๋ฌด ์ˆ˜์ •, ํŒจํ‚ค์ง€ ๋งค๋‹ˆ์ € ์ˆ˜์ •
  • ex) feat: ๋กœ๊ทธ์ธ ๊ธฐ๋Šฅ ๊ตฌํ˜„
    • : ๋’ค์˜ ๋ฉ”์‹œ์ง€๋Š” ์•Œ์•„๋ณด๊ธฐ ์‰ฝ๊ฒŒ๋งŒ ์ž‘์„ฑ, ๋”ฐ๋กœ ์ปจ๋ฒค์…˜์„ ๋‘์ง„ ์•Š์Œ

์ปค๋ฐ‹ ์ปจ๋ฒค์…˜ ํ‘œ

๐Ÿฟ๊นƒ ์ „๋žต (git flow)

image

  • main : ์ œํ’ˆ์œผ๋กœ ์ถœ์‹œ๋  ์ˆ˜ ์žˆ๋Š” ๋ธŒ๋žœ์น˜
  • develop : ๋‹ค์Œ ์ถœ์‹œ ๋ฒ„์ „์„ ๊ฐœ๋ฐœํ•˜๋Š” ๋ธŒ๋žœ์น˜
  • feature : ๊ธฐ๋Šฅ์„ ๊ฐœ๋ฐœํ•˜๋Š” ๋ธŒ๋žœ์น˜
  • hotfix : ์ถœ์‹œ ๋ฒ„์ „์—์„œ ๋ฐœ์ƒํ•œ ๋ฒ„๊ทธ๋ฅผ ์ˆ˜์ • ํ•˜๋Š” ๋ธŒ๋žœ์น˜

๐ŸŒˆ์ž‘์—… ๋ฐฉ์‹

  1. main โ†’ develop ๋ถ„๊ธฐ
    • ์ตœ์‹  ๋ฐฐํฌ ์งํ›„์—๋Š” main๊ณผ develop ๋ณ€๊ฒฝ ์‚ฌํ•ญ์ด ๋™์ผํ•จ
  2. develop โ†’ feature/{๊ธฐ๋Šฅ ์ด๋ฆ„} ๋ถ„๊ธฐ
  3. ์ž‘์—… ํ›„ feature โ†’ develop PR
    1. ์ถฉ๋Œ ํ•ด๊ฒฐ ๋ฐ ํ…Œ์ŠคํŠธ ์ฝ”๋“œ pass ํ™•์ธ (CI)
  4. ์ฝ”๋“œ ๋ฆฌ๋ทฐ ์ง„ํ–‰
    1. ์ตœ์†Œ 1๋ฒˆ
  5. feature โ†’ develop Merge
    1. Squash and Merge
    2. merge ํ›„ featrue ๋ธŒ๋žœ์น˜ ์ž๋™ ์‚ญ์ œ
  6. ๋ฐฐํฌ ์‹œ์ ์— develop โ†’ main PR ๋ฐ Merge
    1. Merge commit or Rebase and Merge
    2. CI/CD ์ž‘๋™
  7. ์• ํ”Œ๋ฆฌ์ผ€์ด์…˜ ์žฅ์• ๊ฐ€ ๋ฐœ์ƒํ•˜๋ฉด main โ†’ hotfix/{๋ฌธ์ œ์ƒํ™ฉ} ๋ธŒ๋žœ์น˜๋กœ ๋ถ„๊ธฐ
    1. ๋ฒ„๊ทธ๋ฅผ ๊ณ ์น˜๊ณ  main์œผ๋กœ merge

โšก๏ธPR ํƒฌํ”Œ๋ฆฟ

  • ์ž‘์—… ๋‚ด์šฉ
  • ๋ฆฌ๋ทฐ ํ•ด์คฌ์œผ๋ฉด ์ข‹๊ฒ ๋Š” ๋ถ€๋ถ„ (๊ณ ๋ฏผํ•œ ๋‚ด์šฉ)
  • ์ฐธ๊ณ  ์‚ฌํ•ญ
  • ์Šคํฌ๋ฆฐ์ƒท(fe)

Popular repositories Loading

  1. force_be force_be Public

    [2023 ๋ฉ‹์Ÿ์ด์‚ฌ์ž์ฒ˜๋Ÿผ ์ค‘์•™ํ•ด์ปคํ†ค] ๊ธฐ์„ธ - ๋ฐฑ์—”๋“œ

    Python 2 1

  2. force_fe force_fe Public

    ๊ธฐ์„ธ - ํ”„๋ก ํŠธ์—”๋“œ ์ €์žฅ์†Œ

    JavaScript 1

  3. .github .github Public

Repositories

Showing 3 of 3 repositories
  • force_be Public

    [2023 ๋ฉ‹์Ÿ์ด์‚ฌ์ž์ฒ˜๋Ÿผ ์ค‘์•™ํ•ด์ปคํ†ค] ๊ธฐ์„ธ - ๋ฐฑ์—”๋“œ

    TEAM2-FORCE/force_beโ€™s past year of commit activity
    Python 2 1 0 0 Updated Apr 17, 2024
  • force_fe Public

    ๊ธฐ์„ธ - ํ”„๋ก ํŠธ์—”๋“œ ์ €์žฅ์†Œ

    TEAM2-FORCE/force_feโ€™s past year of commit activity
    JavaScript 1 0 0 0 Updated Aug 18, 2023
  • .github Public
    TEAM2-FORCE/.githubโ€™s past year of commit activity
    0 0 0 0 Updated Aug 5, 2023

People

This organization has no public members. You must be a member to see who’s a part of this organization.

Top languages

Loadingโ€ฆ

Most used topics

Loadingโ€ฆ