깃플로우 관련 하우스미디어 사내 발표 자료

1. ‫ץ޷ب‬
Git flow ҕਬ
ೞ਋झ޷٣য ࢎղ ߊ಴ ੗‫ܐ‬

2. Git ࢎਊ о੉٘
• ழ޿਷ ੘਷ ‫ױ‬ਤ‫۽‬ ೞ‫ח‬ Ѫ੉ જ‫
!׮‬
• “झషয ੘স”੉‫חۄ‬ ௾ ழ޿੉ ੓Ҋ “झషয 4ѐ చ ߡౡ ୶о”, “؊ࠁӝ ௿ܼ द చ ੉‫ز‬ ҳഅ” ١җ э਷ ࣁࣁೠ ழ޿੉
੓ਵ‫ݶ‬ য‫ו‬ Ѫ੉ ա઺ী ଺ইࠁӝ જਸө? ௏٘ী ߡӒо ೞա ߊࢤ೮ਸ ‫ٸ‬, ழ޿ਸ ‫جغ‬۰ঠ ೡ ‫ٸ‬ ੘਷ ‫ױ‬ਤ੄ ழ޿੉
഻ঁ ਬܻೞ‫׮‬.
• ழ޿‫ݺ‬਷ ই‫ې‬ ղਊٜ‫۽‬ द੘ೠ‫׮‬.
• feat: नӏ ӝ‫מ‬ ୶о
•
fi
x: ߡӒ ࣻ੿
• docs: ‫ࢲޙ‬ ࣻ੿
• style: ௏٘ ನ‫ݘ‬౴, ࣁ޷௿‫ۿ‬ ‫ۅ־‬, ௏٘ ߸҃੉ হ‫ח‬ ҃਋
• refactor: ܻಂష݂

3. ௾ স‫ܳޖ‬ ੘਷ স‫ޖ‬ ৈ۞ѐ‫۽‬ ա‫־‬ӝ
য۵Ҋ ௾ স‫ޖ‬о ੘਷ ‫ױ‬ਤ ৈ۞ѐ‫۽‬ ա‫ݶ־‬ औҊ ‫҅ױ‬ ߹‫۽‬ ೧աт ࣻ ੓‫׮‬. + ࣗా
• ೞ਋झজ 4.2
• ೞ਋झজ 4.2 UI ੘স
• ࠭р рѺ ઑ੿ ߂ ۨ੉ইਓ ҳઑ ߸҃ <- ৈӝө૑ ੘ࢿೞ࣑‫ؘח‬ ই‫ې‬୊ۢ ؊ ٣పੌೞѱ ա‫ݶ־‬ જ‫
!׮‬
• ‫(ܻࢲݽ‬ਤ, ই‫ې‬, ৽ଃ, য়ܲଃ) рѺ ઑ੿
• ೞ౟, झ௼‫ە‬ ߡౡ ١ ߡౡٜ рѺ ઑ੿
• োҙ ࢚ಿ ਤ஖ ߸҃
• ೞ਋झজ 4.2 API ো‫ز‬ ੘স
• …

4. ࠳‫ے‬஖ ੹ۚ੉‫ۆ‬
• ৈ۞ ѐߊ੗о ೞա੄ respository(੷੢ࣗ)ܳ ࢎਊೞ‫ח‬ ജ҃ীࢲ ੷੢ࣗܳ ബҗ੸ਵ‫۽‬ ഝ
ਊೞӝ ਤೠ work-
fl
ow(স‫ޖ‬ ൒ܴ)੉‫׮‬.
• ࠳‫ے‬஖੄ ࢤࢿ, ࢏ઁ, ߽೤ ١ git ੄ ਬোೠ ӝ‫מ‬ٜਸ ഝਊ೧ࢲ п ѐߊ੗੄ ഒ‫ۆ‬ਸ ઴੉‫ݴ‬
‫׮‬নೠ ߑधਵ‫۽‬ ࣗझܳ ҙܻೞ‫ח‬ ৉ೡਸ ೠ‫׮‬.

5. ӥ ੗୓‫ب‬ ࠂ੟ೠ‫ؘ‬ ࠳‫ے‬஖ ੹ۚө૑ ҕࠗ೧ঠ ೞա?
࠳‫ے‬஖ ੹ۚ੉ হਵ‫?ݶ‬
য‫ڃ‬ ࠳‫ے‬஖о ୭न੉૑?
য‫ڃ‬ ࠳‫ے‬஖ীࢲ ѐߊਸ द੘೧ঠ ೞ૑?
য٣ী ಹदܳ ࠁղঠ ೞ૑?
ࡈܻ ߡӒ ࣻ੿ਸ ೧ࢲ ߓನ೧ঠೞ‫ؘח‬ য‫ڃ‬
࠳‫ے‬஖ܳ ӝળਵ‫۽‬ ࣻ੿೧ঠೡө?
ߓನ ߡ੹਷ য‫ڃ‬ Ѧ Ҏ‫ۄ‬ঠೞ૑?
੉۠ ࢚ടਸ ୭ࣗചೞӝ ਤ೧ ࢎਊ‫חغ‬ Ѫ੉ ࠳‫ے‬஖ ੹ۚ੉‫׮‬.

6. Git flow ‫ۆ‬
master, develop, feature, release, hot
fi
x ࠳‫ے‬஖ܳ ੉ਊ೧ ൒ܴਸ ࠁৈ઱‫ח‬ ࠳‫ے‬஖ ੹ۚ
• master : জਵ‫۽‬ ୹द‫ػ‬ ࠳‫ے‬஖
• develop : ‫਺׮‬ ୹द ߡ੹ਸ ѐߊೞ‫ח‬ ࠳‫ے‬஖
• feature(s) : ‫ੌױ‬ ӝ‫מ‬ ѐߊਸ ਤೠ ࠳‫ے‬஖
• release(s) : ‫਺׮‬ ߡ੹ ߓನܳ ળ࠺ೞ‫ח‬ ࠳‫ے‬஖
• hot
fi
x(s) : әೠ ߡӒܳ ࣻ੿ೞ‫ח‬ ࠳‫ے‬஖

7. master
জझషয, ೒ۨ੉झషযী ୹द‫ݶغ‬ release ࠳‫ے‬஖ীࢲ ೤୛૓‫׮‬.
• release ীࢲ ߓನо ৮‫ݶغܐ‬ master ী ‫ݠ‬૑ೠ‫׮‬.
• git checkout master
• git merge —no-
ff
release-4.1.0.5
• ߡ੹ కӒٜ੉ ઓ੤ೠ‫׮‬.
• git tag ver4.1.0.5

8. develop
‫਺׮‬ ߡ੹ਸ ѐߊೞӝ ਤೠ base, ӝ‫੉מ‬ ৮‫ݶغܐ‬ develop ী ೤୛૓‫׮‬.
• ߓನо ৮‫ݶغܐ‬ develop ী‫ب‬ ‫ݠ‬૑о ‫׮ػ‬.
• git checkout develop
• git merge —no-
ff
release-4.1.0.5
• ࢜‫۽‬਍ ӝ‫(מ‬झ௼‫)ە‬ਸ ٜ݅ӝ ਤೠ ࠳‫ے‬஖ ࢤࢿೠ‫׮‬.
• git checkout -b feature-scrap
• ࢜‫۽‬਍ ӝ‫מ‬ ѐߊ੉ ৮‫ݶغܐ‬ develop ী ೤୛૓‫׮‬.
• git checkout develop
• git merge —no-
ff
feature-scrap

9. feature
‫ੌױ‬ ӝ‫מ‬ ѐߊਸ ೞ‫ח‬ ࠳‫ے‬஖, develop ীࢲ ࠳‫ے‬஖ܳ ࢤࢿೞҊ ӝ‫מ‬ ѐߊ੉ ৮‫ݶغܐ‬ develop ী ೤୛૓‫׮‬.
• ࢜‫۽‬਍ ӝ‫מ‬ਸ ٜ݅ӝ ਤೠ ࠳‫ے‬஖ ࢤࢿೠ‫׮‬. ӝ‫מ‬ ѐߊ ࠳‫ے‬஖ ੉ܴ਷ feature ী - ਸ ࠢ੉Ҋ ѐߊೞ‫ח‬ ӝ‫ݺמ‬ਸ
੸‫׮ח‬. bug
fi
x-house4.1 ੉۠ ध੄ ੉ܴ‫ب‬ о‫מ‬ೞ‫׮‬. ‫ܲ׮‬ 4ѐ੄ ࠳‫ے‬஖‫ݺ‬ ৻ী য‫ڃ‬ ੉ܴ‫ب‬ ࢎਊೡ ࣻ ੓‫׮‬.
• git checkout -b feature-scrap
• ࠗ࠙੉ ৮‫ؼܐ‬ ‫׮݃ٸ‬ ழ޿ਸ ೠ‫׮‬.
• git commit -m “feat: झ௼‫ە‬ ߡౡ UI ୶о”
• git commit -m “feat: ‫ܲ׮‬ ࢎ‫੄ۈ‬ झ௼‫ە‬ ࠁӝ ҳഅ”
• ࢜‫۽‬਍ ӝ‫מ‬ ѐߊ੉ ৮‫ݶغܐ‬ develop ী ೤୛૓‫׮‬.
• git checkout develop
• git merge —no-
ff
feature-scrap

10. release
develop ীࢲ ߓನܳ ળ࠺ೡ ‫ٸ‬ ࢤࢿೞ‫ח‬ ࠳‫ے‬஖, ߡ੹‫ݺ‬җ ࠽٘ ߣഐ ١ਸ ੉ ࠳۪஖ীࢲ ࣻ੿ೠ‫׮‬.
• develop ীࢲ ࢜‫۽‬਍ ߡ੹ਸ ߓನೞӝ ਤೠ ࠳‫ے‬஖ ࢤࢿೠ‫׮‬.
• git checkout -b release-4.1.0.5
• ߡ੹‫ݺ‬җ ࠽٘ ߣഐ ١ਸ ߓನ‫חغ‬ ߡ੹ী ‫ݏ‬ѱ ࣻ੿ೞҊ Ӓ ղਊٜਸ ழ޿ೠ‫׮‬.
• git commit -m “docs: ߡ੹, ࠽٘ߣഐ ੑ۱”
• Ѩࣻ ਃ୒ী पಁೞ‫ݶ‬ ࣻ੿ೠ ղਊٜਸ ழ޿ೠ‫׮‬.
• git commit -m “
fi
x: ࢎਊ੗ ର‫ױ‬ ӝ‫מ‬ ୶о”
• ߓನо ࢿҕೞ‫ݶ‬ master, develop ী ೤୛૓‫׮‬.
• git merge —no-
ff
release-4.1.0.5

11. hotfix
әೠ ߡӒܳ ࣻ੿ೞ‫ח‬ ࠳‫ے‬஖
• ߓನ‫ػ‬ ߡ੹ੋ master ীࢲ әೠ ߡӒܳ ࣻ੿ೞӝ ਤೠ ࠳‫ے‬஖ܳ ࢤࢿೠ‫׮‬.
• git checkout master
• git checkout -b hot
fi
x-4.1.0.5
• ߡӒܳ ࣻ੿ೞҊ Ӓ ղਊٜਸ ழ޿ೠ‫׮‬.
• git commit -m “
fi
x: ೐‫۽‬೙ ച‫ݶ‬ਵ‫۽‬ о‫ݶ‬ জ੉ ԁ૑‫ח‬ ߡӒ ࣻ੿”
• hot
fi
x ‫ח‬ ܾܻૉ‫۽‬ о૑ ঋҊ ߄‫۽‬ hot
fi
xীࢲ ߡ੹,࠽٘ߣഐ ࣻ੿ റ ߓನ
• git commit -m “docs: ߡ੹, ࠽٘ߣഐ ࣻ੿”
• ߓನо ࢿҕೞ‫ݶ‬ master, develop ী ೤୛૓‫׮‬.
• git merge —no-
ff
hot
fi
x-4.1.0.5

12. ੘স ൒ܴ
Work
fl
ow
‫ز‬Ӓ‫ח޷ۄ‬ ழ޿
‫ݠ‬૑ೡ ‫ٸ‬ ੉ ൒ܴਸ ੷੢ೞӝ ਤ೧
git merge —no-
ff
২࣌ਸ ࢎਊೠ‫׮‬.
ߡ੹ tag ‫ח‬ master ী ‫ݠ‬૑‫ݶغ‬ ࢤӝ‫ח‬ ழ޿ী Ѥ‫׮‬.

13. develop release hot
fi
x master
feature
4.1.0.4 ߡ੹ 4.1.0.4 ߡ੹
feature-scrap ࠳‫ے‬஖ ࢤࢿ
झ௼‫ە‬ ߡౡ UI ୶о
झ௼‫ە‬ API ো‫ز‬
‫ܲ׮‬ ࢎ‫੄ۈ‬ झ௼‫ە‬ ࠁӝ ҳഅ
ӝ‫מ‬ ѐߊ੉ ৮‫غܐ‬Ҋ పझ౟ ాҗ द ‫ݠ‬૑ ߓನܳ ਤೠ release-4.1.0.5 ࠳‫ے‬஖ ࢤࢿ
ߡ੹ 4.1.0.5 ‫۽‬ ߸҃
बࢎ पಁೞ‫ݶ‬ ߡӒ ࣻ੿
बࢎ ాҗ೧ࢲ ߓನ‫ݶغ‬ master ৬ ‫ݠ‬૑
కӒ 4.1.0.5
ߓನ‫ػ‬ ߡ੹਷ develop ী‫ب‬ ‫ݠ‬૑
ਤী ੌ۲੄ җ੿੉ ߈ࠂ
కӒ 4.1.0.4

14. develop release hot
fi
x master
feature
4.1.0.4 ߡ੹ 4.1.0.4 ߡ੹
feature-reload ࠳‫ے‬஖ ࢤࢿ
জ јन ӝ‫מ‬
ҳӖ ௑ࣛ ࠺੿࢚ઙ‫ܐ‬ ߡӒ ࣻ੿
పझ౟ ాҗೞ‫ݶ‬ ‫ݠ‬૑
ߓನܳ ਤೠ release-4.1.0.5 ࠳‫ے‬஖ ࢤࢿ
ߡ੹ 4.1.0.5 ‫۽‬ ߸҃
बࢎ पಁೞ‫ݶ‬ ߡӒ ࣻ੿
बࢎ ాҗ೧ࢲ ߓನ‫ݶغ‬ master ৬ ‫ݠ‬૑
కӒ 4.1.0.5
ߓನ‫ػ‬ ߡ੹਷ develop ী‫ب‬ ‫ݠ‬૑
bug
fi
x-googleconsole ࠳‫ے‬஖ ࢤࢿ
bug
fi
x-ui ࠳‫ے‬஖ ࢤࢿ
झషয చ ఋ੉ౣ ࣻ੿
‫۽‬Ӓইਓ റ ੤‫۽‬Ӓੋ द ‫۽‬٬ ೐‫۽‬Ӓ‫ې‬झ߄о উহয૑‫ח‬ ߡӒ ࣻ੿
әೠ ߡӒ ࣻ੿ਸ ਤೠ hot
fi
x-4.1.0.5 ࠳‫ے‬஖ ࢤࢿ
కӒ 4.1.0.6
৔࢚ ੤ࢤ ߡౡ੉ ੤ࢤ ઺੐ী‫ب‬ ࠁৈ૑‫ח‬ ߡӒ ࣻ੿
పझ౟ ਊ ࠳۪஖ ࢤࢿ test-reloadAndbugFix
बࢎ ాҗ೧ࢲ ߓನ‫ݶغ‬ master ৬ ‫ݠ‬૑
కӒ 4.1.0.4

15. feature ࠳‫ے‬஖ী ੓‫ח‬ ੘সٜ੉ ߓನ ੹ী ԙ ೤୛ઉঠೡ ೙ਃ‫ח‬ হ‫׮‬.
‫۽ٮ‬ ੘সೞ‫׮‬о v1.0 ߓನо ՘դ റী develop ী ೤୛૕ ࣻ ੓਺

16. ࢤп೧ ࠅ ԁܻٜ
• పझ౟‫ח‬ ঱ઁ? য‫ڃ‬ ࠳‫ے‬஖ীࢲ?
• п ӝ‫מ‬ feature ࠳‫ے‬஖ীࢲ ೞ‫ח‬ Ѫ੉ જ‫׮‬Ҋ ࢤп೮‫׮‬. develop ী ‫ݠ‬૑ܳ ೠ ٍী పझ౟ܳ ೧ࢲ ߡӒо ߊࢤೞ
‫ݶ‬ ‫׮‬द ߡӒܳ Ҋ஖‫ח‬ bug
fi
x ࠳‫ے‬஖ܳ ٜ݅যঠ ೞҊ ‫ژ‬ ‫׮‬द ‫ݠ‬૑ܳ ೞ‫ח‬ ١੄ ୶о੸ੋ ੘স੉ ߊࢤೠ‫׮‬.
• ୭‫؀‬ೠ п ӝ‫מ‬ feature ࠳‫ے‬஖ীࢲ పझ౟ೞҊ ৈ۞ ӝ‫מ‬ਸ ೣԋ పझ౟೧ঠೞ‫ݶ‬ п ӝ‫מ‬ feature ࠳‫ے‬஖ܳ ‫ݠ‬૑
೧ࢲ పझ౟ೡ ࣻ ੓ਸ Ѫ੉‫׮‬.
• Release ࠳‫ے‬஖ীࢲ नӏ ߡӒо ߊࢤೠ‫
?ݶ׮‬
• ੉ߣ ߡ੹ী ѐߊೠ ӝ‫੉מ‬ ই‫צ‬ नӏ ߡӒо ߊࢤೞ‫ݶ‬ release ࠳‫ے‬஖ীࢲ ࢜‫۽‬਍ bug
fi
x ࠳‫ے‬஖ܳ ࢤࢿೞҊ ੘
স೧ঠ ೠ‫׮‬Ҋ పয়о ੸য֬ও‫׮‬.
• ‫਺׮‬ ߓನо ই‫צ‬ ޷‫੄ې‬ ߓನܳ ਤೠ ੘স ҙܻ‫
?ח‬
• ҅ࣘ ߹‫ب‬ ࠳‫ے‬஖‫۽‬ ࠁҙೞ‫׮‬о ߓನೡ द੼ী develop ী ೤஖‫ݶ‬ ‫ؼ‬ Ѫ э‫׮‬.

17. ݃‫ܻޖ‬
• ੉۞ೠ ࠳‫ے‬஖ ࢤࢿ, ‫ݠ‬૑ ١ਸ ࠁҊ ൒ܴਸ ౵ঈೡ ࣻ ੓‫ח‬ Ѫ੉ Git
fl
ow ܳ ࢎਊೞ‫ח‬ ੉ਬ‫׮‬.
• ੉ۧѱ ࢎਊ‫ػ‬ ࠳‫ے‬஖ٜ਷ develop җ master ܳ ઁ৻ೞҊ‫ח‬ ‫ݠ‬૑о ৮‫ݶغܐ‬ ઁѢೠ‫׮‬.
• ࢎਊ‫חغ‬ git ‫ݺ‬۸য‫ח‬ 5ѐ ੿‫ب‬ ߆ী ‫غ‬૑ ঋਵ‫ݴ‬ য۰ਕࠁ੉૑݅ ࢎਊೞ‫ݶࠁ׮‬ ੊ࣼ೧૕ ࣻ
੓‫׮‬.
• ӝࠄ੸ੋ ࠳۪஖ ҳઑܳ ࢤࢿ೧઱‫ח‬ git
fl
ow avh ‫חۄ‬ Ѫਸ ࢸ஖ೡ ࣻ‫ب‬ ੓‫׮‬. iOS ‫ח‬ ࢸ஖ೞ
૑ ঋҊ ೞ‫ח‬ ઺੉‫׮‬.
• 1ѐਘ ੉࢚੄ ӟ ഐ൚ਵ‫۽‬ ѐߊೞৈ ઱ӝ੸ਵ‫۽‬ ߓನ, QA ߂ పझ౟, hot
fi
x ١ ࣻ೯ೡ ࣻ ੓‫ח‬
ৈ۱੉ ੓‫ח‬ ౱ী য਎ܻ‫ח‬ ࠳‫ے‬஖ ੹ۚ੉‫׮‬.

18. ଵҊ ੗‫ܐ‬
• https://yoonghee.tistory.com/78
• https://blog.gangnamunni.com/post/understanding_git_
fl
ow/
• https://hyeon9mak.github.io/git-branch-strategy/
• https://yoonghee.tistory.com/78
• https://hbase.tistory.com/60
• https://ujuc.github.io/2015/12/16/git-
fl
ow-github-
fl
ow-gitlab-
fl
ow/