Upgrade to Pro — share decks privately, control downloads, hide ads and more …
Sign up for free

A successful Git branching model 導讀

Avatar for Wen_Liao Wen_Liao
January 10, 2015
Technology
750
0

A successful Git branching model 導讀

11/Jan/2015: 新增為什麼要用FF以及release圖片少說明的地方
12/Jan/2015: Fix typo

Avatar for Wen_Liao

Wen_Liao

January 10, 2015

More Decks by Wen_Liao

See All by Wen_Liao
COSCUP-2020-Linux 軟體組裝工和他的工具們
Avatar for Wen_Liao wen_liao
2
1.5k
開放街圖 自助旅行的好幫手
Avatar for Wen_Liao wen_liao
0
1.3k
GNU AS簡介
Avatar for Wen_Liao wen_liao
0
1.2k
UPnP 1.0 簡介
Avatar for Wen_Liao wen_liao
0
1.2k
自由軟體和 Richard Stallman
Avatar for Wen_Liao wen_liao
0
2.4k
Hello world在那邊？背景說明 0
Avatar for Wen_Liao wen_liao
0
830
GNU ld的linker script簡介
Avatar for Wen_Liao wen_liao
0
1.5k
Trace 程式碼之皮
Avatar for Wen_Liao wen_liao
0
980
淺談Debian套件打包
Avatar for Wen_Liao wen_liao
0
730

Other Decks in Technology

See All in Technology
書き手が人でもAIでも正しくなる道、 SREを埋め込んだDeveloper Platform / tech drivers day8
Avatar for mekka chmikata
4
780
AI駆動開発におけるハーネスエンジニアリングの勘所
Avatar for つくぼし tsukuboshi
1
810
構造で守らせる　データ・法務・セキュリティ・開発チームとつくる AI時代のデータガバナンスとデータ基盤のリアル
Avatar for LegalOn Technologies, Inc legalontechnologies
PRO
2
580
1週間、Opus封印でお願いします
Avatar for KintoTech_Dev kintotechdev
0
260
Snowflake でできることが増えたら、 ABAC が必要になった
Avatar for Tatsuya Hanyu kaeton
0
100
reInvent2026stby LT00 "Change your life!"
Avatar for Shinichiro Kawano shinichirokawano
1
340
野良MCPサーバーを排除せよ！MCPサーバーのガバナンス
Avatar for YukiOgawa yukiogawa
1
250
AI時代のGraphQL
Avatar for joe_re joere
3
410
AWSセキュリティで活用するAI機能
Avatar for cm-usuda-keisuke cmusudakeisuke
1
320
正解のない研修に放り出されて / Being thrown into a training program with no right answers
Avatar for akira ohno ohnoeight
1
150
Claude for Google Workspaces ポン出し/claude-for-google-workspace-slide-conversion
Avatar for emi emiki
0
13k
「作れる」と「リリースできる」の間にあったもの── PdMを外して見えた、PdMがやるべき仕事/Buildable ≠ Shippable: What Removing the PM Taught Me About the PM’s Job
Avatar for Yappli Developers yappli_developers
0
310

Featured

See All Featured
Typedesign – Prime Four
Avatar for Hannes Fritz hannesfritz
42
3.2k
[Rails World 2023 - Day 1 Closing Keynote] - The Magic of Rails
Avatar for Eileen M. Uchitelle eileencodes
38
3.1k
Deep Space Network (abreviated)
Avatar for Tony Rice tonyrice
0
380
The World Runs on Bad Software
Avatar for Brandon Keepers bkeepers
PRO
72
12k
How Fast Is Fast Enough? [PerfNow 2025]
Avatar for Tammy Everts tammyeverts
3
950
[SF Ruby Conf 2025] Rails X
Avatar for Vladimir Dementyev palkan
3
1.5k
Visual Storytelling: How to be a Superhuman Communicator
Avatar for David Neal reverentgeek
2
720
Improving Core Web Vitals using Speculation Rules API
Avatar for Sergey Chernyshev sergeychernyshev
21
1.7k
RailsConf & Balkan Ruby 2019: The Past, Present, and Future of Rails at GitHub
Avatar for Eileen M. Uchitelle eileencodes
141
35k
Facilitating Awesome Meetings
Avatar for Lara Hogan lara
57
7.2k
Max Prin - Stacking Signals: How International SEO Comes Together (And Falls Apart)
Avatar for Tech SEO Connect techseoconnect
PRO
0
500
How People are Using Generative and Agentic AI to Supercharge Their Products, Projects, Services and Value Streams Today
Avatar for Helen Beal helenjbeal
2
370

Transcript

  1. Wen Liao A successful Git branching model 導讀 高雄，旗山

  2. Disclaimer 投影片資料為作者整理資料及個人意見，沒有經 過嚴謹確認，請讀者自行斟酌

  3. 目標 導讀 A successful Git branching model的軟體 Release方式 URL: http://nvie.com/posts/a-successful-git-

    branching-model/

  4. 背景知識 Fast Forward Merge 簡稱FF

  5. 背景知識 Fast Forward Merge in GIT: Before branch Master Branch

    Head Master Head

  6. 背景知識 Fast Forward Merge GIT: After branch Master Branch Head

    Master Head

  7. 背景知識 非Fast Forward Merge in GIT: Before branch Master Branch

    Head Master Head

  8. 背景知識 非Fast Forward Merge GIT: After branch Master Branch Head

    Master Head merge

  9. 為什麼要提FF? • 可以保留branch更動的footprint

  10. branch Master Branch Head Master Head branch Master Branch Head

    Master Head merge VS 那一個比較清楚地顯 示軟體branch的關聯 性？

  11. 作者的Branches 分類 • Main branches ◦ Master ◦ Develop •

    Supporting branches ◦ Feature ◦ Release ◦ Hotfix

  12. Main Branches Develop Master branch merge when production release merge

    when production release AKA: integration Master: 保證product ready 狀態 Develop: • 隨時為下一次 Release準備 • 放 ◦ Feature ◦ Fix ◦ Release更動 ▪ 版號 ▪ 路徑 ▪ ... Tag: 版號 Tag: 版號

  13. Feature Branch • 一定從develop branch出來 • 寫完merge 回develop branch •

    寫的不如預期可以宰掉 • 一定要用NO FF • 可以定相關的branch name convention

  14. Feature Branch: USE NO FF merge branch Develop Branch Head

    Develop Head merge

  15. Release Branch • 一定從develop branch出來 • 用來處理Release相關事物 ◦ 改版號 ◦

    改PATH ◦ ...

  16. Release Branch • Branch出來，處理Release相關事物中，如果 發現錯誤，要merge 回develop branch • 確認無誤，可以出貨後 ◦

    merge回develop和master ◦ master tag release版號 ◦ 可以宰掉release branch • 一定要用NO FF • 可以定相關的branch name convention

  17. Release Branch: USE NO FF merge branch Develop Release Head

    Develop Head Bug fix merge merge Master Master Head Tag with version

  18. Hotfix Branch • 一定從master branch出來 • 用來處理Release後被客戶或是QA抓包的錯 誤 • 可以順便進版表示該版本是Fix

    bug，如1.2晉 升到1.2.1 • 修正完畢要merger回master，視情況merge回 develop ◦ 因為有可能develop已無此功能或是已修正

  19. Hotfix Branch • 如果舊版正在進行hot fix，而新版release branch也正在進行中，請直接merge到release branch而不是develop branch • 確認修正後，可以刪除該branch

    • 一定要用NO FF • 可以定相關的branch name convention

  20. Hotfix Branch: USE NO FF merge branch Develop Hotfix Head

    Develop Head Bug fix merge merge Master Master Head 進版Bug fix