Skip to content

๐Ÿš€ HMH Git flow

Zoe edited this page Jan 2, 2024 · 6 revisions

1๏ธโƒฃย Branch

default ๋ธŒ๋žœ์น˜ : develop

Branch ์ „๋žต

gitbranch

  1. ๊ฐ์ž ์ž‘์—…ํ•  ๋ธŒ๋žœ์น˜๋ฅผ develop์—์„œ ์ƒ์„ฑํ•ฉ๋‹ˆ๋‹ค.
  • ์ž‘์—…์ด ๊ธธ์–ด์งˆ ๊ฒฝ์šฐ, 1) develop checkout 2) Merge develop into ๋‚ด ๋ธŒ๋žœ์น˜
  • ๋‚ด ๋ธŒ๋žœ์น˜์— develop์— ๋จธ์ง€๋œ ์‚ฌํ•ญ๋“ค์ด ์—…๋ฐ์ดํŠธ ๋œ๋‹ค๊ณ  ์ƒ๊ฐํ•˜๋ฉด ๋ฉ๋‹ˆ๋‹ค!
  1. ์ž‘์—…์ด ๋๋‚œ ํ›„ Pull Request๋ฅผ ํ†ตํ•ด 2๊ฐœ์˜ Approve๋ฅผ ๋ฐ›์€ ๋ธŒ๋žœ์น˜๋ฅผ develop์— mergeํ•ฉ๋‹ˆ๋‹ค.
  2. Release Version์„ ์—…๋ฐ์ดํŠธํ•  ๋•Œ main ๋ธŒ๋žœ์น˜๋ฅผ ์‚ฌ์šฉํ•ฉ๋‹ˆ๋‹ค.
main - release ๊ด€๋ฆฌ 
develop - ๋จธ์ง€์šฉ (default)
feat - ๊ฐ์ž ์‚ฌ์šฉํ•˜๋Š” ๋ธŒ๋žœ์น˜

๋ธŒ๋žœ์น˜ ๋„ค์ด๋ฐ ๊ทœ์น™

prefix /#issueNumber/ ์ž‘์—…ํ•œ view

  • ํด๋”๋ง
  • ์ด์Šˆ๋ฒˆํ˜ธ
  • ์ž‘์—… ์š”์•ฝ
  • ์˜ˆ์‹œ
feat/#1-calendarView

2๏ธโƒฃย ์ด์Šˆ

  • **ํ•„์ˆ˜ : Assignees(๋ณธ์ธ), Labels, Project, MileStone ์„ค์ • ํ•„์ˆ˜**
  • ์ด์Šˆ ์ƒ์„ฑ ํ›„ Project์˜ status, priority, Size๋ฅผ ์„ค์ •ํ•ด์ฃผ์„ธ์š”!

Prefix

  • [Feat] โ†’ ๊ธฐ๋Šฅ ๊ตฌํ˜„
  • [Style] โ†’ ์ปค์Šคํ…€ ๋ทฐ ์งœ๊ธฐ
  • [Fix] โ†’ ์˜ค๋ฅ˜ ๊ณ ์น˜๋Š” ๊ฒƒ / ์ˆ˜์ •์šฉ
  • [Set] โ†’ ์„ธํŒ…ํ•  ์‹œ
  • [Network] โ†’ api ๋ถ™์ผ๋•Œ
  • ์ž‘์—… ์„ค๋ช…
---
name: "๐Ÿฉท issue template"
about: Zoe์˜ ์ƒˆ๋กœ์šด ์ด์Šˆ ์ถ”๊ฐ€
title: "[Feat] description"
labels: [๐Ÿฉท ์ง€ํฌ]
assignees: Zoe929

---

## ๐Ÿ’ก About
<!--๋ฌด์—‡์— ๊ด€ํ•œ ์ด์Šˆ์ธ์ง€ ์†Œ๊ฐœํ•ด์ฃผ์„ธ์š”.-->

3๏ธโƒฃย Pull Request

PR ๊ทœ์น™

  • Feat [#์ด์Šˆ๋ฒˆํ˜ธ] ์ž‘์—… ์„ค๋ช…
  • 2๊ฐœ์˜ Approve๋ฅผ ๋ฐ›์„ ๊ฒฝ์šฐ merge (๋ณธ์ธ์ด ์ง์ ‘ merge)

Feat [#4] ์ปค์Šคํ…€ ๋„ค๋น„๊ฒŒ์ด์…˜ ๋ฐ” ๊ตฌํ˜„ by Zoe0929 ยท Pull Request #5 ยท DO-SOPT-APP3-Airbnb/Airbnb-iOS

## ์ž‘์—… ๋‚ด์šฉ
์ž‘์—…ํ•œ ๋‚ด์šฉ ์“ฐ๊ธฐ

## PR Point
์„ค๋ช…์ด ํ•„์š”ํ•œ ์ฝ”๋“œ๋‚˜ ๋…ผ์˜๊ฐ€ ํ•„์š”ํ•œ ๋ถ€๋ถ„์„ ์ž‘์„ฑํ•ฉ๋‹ˆ๋‹ค.
์ฝ”๋“œ ๋„ฃ์„ ๋•Œ๋Š” permaLink ์‚ฌ์šฉํ•ด๋ณด๊ธฐ 

## ์Šคํฌ๋ฆฐ์ƒท
Gif๋‚˜ ์Šคํฌ๋ฆฐ์ƒท ํ•„์ˆ˜๋กœ ๋„ฃ์–ด์ฃผ์„ธ์š”.

## ์ด์Šˆ๋„˜๋ฒ„
issue: #์ด์Šˆ๋„˜๋ฒ„ 

4๏ธโƒฃย ์ปค๋ฐ‹ ์ปจ๋ฒค์…˜

[prefix/#์ด์Šˆ๋„˜๋ฒ„] ๋ทฐ ์ด๋ฆ„ - ์ž‘์—… ์„ค๋ช…
ex. [Feat/#12] Home - ์„œ์น˜๋ฐ” ๋ ˆ์ด์•„์›ƒ
  • prefix์™€ ํ•จ๊ป˜ ์ด์Šˆ ๋„˜๋ฒ„๋ฅผ ๊ธฐ์žฌํ•ด์ฃผ์„ธ์š”!

Prefix

  • Set
  • Feat
  • Chore
  • Add
  • Delete
  • Fix
  • Refactor
  • ํ”„๋ฆฌํ”ฝ ๋’ค์— ์ •ํ™•ํžˆ ๋‚ด๊ฐ€ ๋ฌด์—‡์„ ํ–ˆ๋Š”์ง€ ์ ๊ธฐ

5๏ธโƒฃย ์ฝ”๋“œ๋ฆฌ๋ทฐ

์ปค๋ฎค๋‹ˆ์ผ€์ด์…˜ ๋น„์šฉ์„ ์ค„์ด๊ธฐ ์œ„ํ•œ Pn ๋ฃฐ

์ฝ”๋“œ ๋ฆฌ๋ทฐ in ๋ฑ…ํฌ์ƒ๋Ÿฌ๋“œ ๊ฐœ๋ฐœ ๋ฌธํ™” | ๋ฑ…ํฌ์ƒ๋Ÿฌ๋“œ

Clone this wiki locally