A Git tutorial with example and demo.
YouTube Videos
Day 1: https://www.youtube.com/watch?v=XBreuLi79bk
Day 2: https://www.youtube.com/watch?v=5e6i3r5Vz34
A Git tutorial with example and demo.
YouTube Videos
Day 1: https://www.youtube.com/watch?v=XBreuLi79bk
Day 2: https://www.youtube.com/watch?v=5e6i3r5Vz34
11. main
B : 分支, Branch
C : 提交, Commit
M : 合併, Merge
分支策略(TFS)– Release Isolation Flow
release-1.0.0 C
M B
release-1.1.0
CCC
C
bug
B
release-1.0.1
C
bug-fix
13. master
B : 分支, Branch
C : 提交, Commit
M : 合併, Merge
分支策略(Git) – Trunk Based Development
13
B
topic-1 C
release-1.0.0
PR
M
topic-1
C C… …
B
C
bug
bug-fix-1 C
B
bug-fix-1
M
cherry-pick
topic-2
B M
PR
topic-2
C C C… …
C
M
PR
release-1.0.1
14. 分支策略(Git) – Trunk Based Development
▪ 優點
▪ 分支週期短,反饋速度較快
▪ 僅需維護一條 master 分支,減少合併衝突機率
▪ 缺點
▪ 多條分支同時合併回 master 時,易發生 CI 資源搶用現象
▪ Topic 分支容易受 master 分支影響
14
31. 推薦閱讀 – Git & Branch Strategies
▪ Git Turtorials (Bitbucket)
▪ Branch Strategies for TFS (MSDN)
▪ How We Use Git At Microsoft (MSDN)
▪ Trunk Based Introduction
31
32. 推薦閱讀 – How to Migrate
▪ 從集中版本控制到分散式版本控制 (王建興)
▪ TFS Git 筆記 - 該用 TFVC 還是 Git?(黑暗執行緒)
▪ TFS Git 筆記 - TFVC - Git 專案搬家經驗談 (黑暗執行緒)
▪ Map TFVC actions to Git (MSDN)
▪ Plan your migration to Git (MSDN)
32