Version Control - Patterns and Practices
-
Upload
chris-oldwood -
Category
Software
-
view
206 -
download
6
description
Transcript of Version Control - Patterns and Practices
![Page 1: Version Control - Patterns and Practices](https://reader033.fdocuments.in/reader033/viewer/2022042814/55499b8cb4c905a6758b491c/html5/thumbnails/1.jpg)
Version Control – Version Control – Patterns & PracticesPatterns & Practices
Chris OldwoodChris Oldwood
ACCU Conference 2014ACCU Conference 2014
@chrisoldwood / @chrisoldwood / [email protected]@cix.co.uk
![Page 2: Version Control - Patterns and Practices](https://reader033.fdocuments.in/reader033/viewer/2022042814/55499b8cb4c905a6758b491c/html5/thumbnails/2.jpg)
Pending CommitsPending Commits
ArchitecturesArchitectures WorkspaceWorkspace BranchingBranching MergingMerging CommittingCommitting BuildingBuilding LabellingLabelling ArchaeologyArchaeology
![Page 3: Version Control - Patterns and Practices](https://reader033.fdocuments.in/reader033/viewer/2022042814/55499b8cb4c905a6758b491c/html5/thumbnails/3.jpg)
ArchitecturesArchitectures
![Page 4: Version Control - Patterns and Practices](https://reader033.fdocuments.in/reader033/viewer/2022042814/55499b8cb4c905a6758b491c/html5/thumbnails/4.jpg)
SourceSafe + Robocopy = SourceSafe + Robocopy = DVCS DVCS
NAS(VSS)
Desktop(VSS)
Laptop(VSS)
Office(VSS)
ROBOCOPYCheck-In
![Page 5: Version Control - Patterns and Practices](https://reader033.fdocuments.in/reader033/viewer/2022042814/55499b8cb4c905a6758b491c/html5/thumbnails/5.jpg)
WorkspaceWorkspace
![Page 6: Version Control - Patterns and Practices](https://reader033.fdocuments.in/reader033/viewer/2022042814/55499b8cb4c905a6758b491c/html5/thumbnails/6.jpg)
BranchingBranching
![Page 7: Version Control - Patterns and Practices](https://reader033.fdocuments.in/reader033/viewer/2022042814/55499b8cb4c905a6758b491c/html5/thumbnails/7.jpg)
Integration/Development Integration/Development BranchBranch
1 2 3 4 5
![Page 8: Version Control - Patterns and Practices](https://reader033.fdocuments.in/reader033/viewer/2022042814/55499b8cb4c905a6758b491c/html5/thumbnails/8.jpg)
Release BranchRelease Branch
3 4 5 6 7
A B
Stable
Volatile
![Page 9: Version Control - Patterns and Practices](https://reader033.fdocuments.in/reader033/viewer/2022042814/55499b8cb4c905a6758b491c/html5/thumbnails/9.jpg)
Feature/Task/Private BranchFeature/Task/Private Branch
3 4 5 6 7
A B C
More Stable
More Volatile
![Page 10: Version Control - Patterns and Practices](https://reader033.fdocuments.in/reader033/viewer/2022042814/55499b8cb4c905a6758b491c/html5/thumbnails/10.jpg)
ShelvingShelving
1 2 3
![Page 11: Version Control - Patterns and Practices](https://reader033.fdocuments.in/reader033/viewer/2022042814/55499b8cb4c905a6758b491c/html5/thumbnails/11.jpg)
ShelvingShelving
1 2 4 5 6
3
![Page 12: Version Control - Patterns and Practices](https://reader033.fdocuments.in/reader033/viewer/2022042814/55499b8cb4c905a6758b491c/html5/thumbnails/12.jpg)
No Branch (Feature No Branch (Feature Toggles)Toggles)
1a 2 1b 3 1c
Always Ready to Ship
![Page 13: Version Control - Patterns and Practices](https://reader033.fdocuments.in/reader033/viewer/2022042814/55499b8cb4c905a6758b491c/html5/thumbnails/13.jpg)
MergingMerging
![Page 14: Version Control - Patterns and Practices](https://reader033.fdocuments.in/reader033/viewer/2022042814/55499b8cb4c905a6758b491c/html5/thumbnails/14.jpg)
Integration PainsIntegration Pains
3 4 5 6 7
X Y Z
A B
![Page 15: Version Control - Patterns and Practices](https://reader033.fdocuments.in/reader033/viewer/2022042814/55499b8cb4c905a6758b491c/html5/thumbnails/15.jpg)
Cherry PickingCherry Picking
3 4 5 6 7
A CB
![Page 16: Version Control - Patterns and Practices](https://reader033.fdocuments.in/reader033/viewer/2022042814/55499b8cb4c905a6758b491c/html5/thumbnails/16.jpg)
CommittingCommitting
![Page 17: Version Control - Patterns and Practices](https://reader033.fdocuments.in/reader033/viewer/2022042814/55499b8cb4c905a6758b491c/html5/thumbnails/17.jpg)
BuildingBuilding
![Page 18: Version Control - Patterns and Practices](https://reader033.fdocuments.in/reader033/viewer/2022042814/55499b8cb4c905a6758b491c/html5/thumbnails/18.jpg)
Gatekeeper WorkflowsGatekeeper Workflows
3 4 5 6 7
X Y
BAlice
Bob
C
GK
Z
D
![Page 19: Version Control - Patterns and Practices](https://reader033.fdocuments.in/reader033/viewer/2022042814/55499b8cb4c905a6758b491c/html5/thumbnails/19.jpg)
LabellingLabelling
![Page 20: Version Control - Patterns and Practices](https://reader033.fdocuments.in/reader033/viewer/2022042814/55499b8cb4c905a6758b491c/html5/thumbnails/20.jpg)
Branching From a LabelBranching From a Label
3 4 5 6 7
A B
v1 X Y
v1.1
![Page 21: Version Control - Patterns and Practices](https://reader033.fdocuments.in/reader033/viewer/2022042814/55499b8cb4c905a6758b491c/html5/thumbnails/21.jpg)
ArchaeologyArchaeology
![Page 22: Version Control - Patterns and Practices](https://reader033.fdocuments.in/reader033/viewer/2022042814/55499b8cb4c905a6758b491c/html5/thumbnails/22.jpg)
LiteratureLiterature
![Page 23: Version Control - Patterns and Practices](https://reader033.fdocuments.in/reader033/viewer/2022042814/55499b8cb4c905a6758b491c/html5/thumbnails/23.jpg)
Questions?Questions?
![Page 24: Version Control - Patterns and Practices](https://reader033.fdocuments.in/reader033/viewer/2022042814/55499b8cb4c905a6758b491c/html5/thumbnails/24.jpg)
Blog:Blog:
http://chrisoldwood.blogspot.comhttp://chrisoldwood.blogspot.com
@chrisoldwood / @chrisoldwood / [email protected]@cix.co.uk