Upgrade to Pro
— share decks privately, control downloads, hide ads and more …
Speaker Deck
Features
Speaker Deck
PRO
Sign in
Sign up for free
Search
Search
"You've decided to Use Git as Your VCS for Your...
Search
Chris Hartjes
February 01, 2012
Programming
5
650
"You've decided to Use Git as Your VCS for Your Team...So Now What?
Slides from the presentation I gave at the php|arch Git Summit
Chris Hartjes
February 01, 2012
Tweet
Share
More Decks by Chris Hartjes
See All by Chris Hartjes
Confessions of a not-so-accidental leader
grumpycanuck
0
160
Lessons Learned From 10 Years Of Testing
grumpycanuck
3
120
Learn To Test Like A Grumpy Programmer
grumpycanuck
0
210
Time Management For Grumpy Programmers
grumpycanuck
0
190
Learn To Test Like A Grumpy Programmer
grumpycanuck
1
210
Learn To Test Like A Grumpy Programmer
grumpycanuck
2
180
Grumpy Testing Patterns
grumpycanuck
1
890
Embrace Your Inner Grumpy: Metatesting in 2016
grumpycanuck
0
110
Smelly Tests
grumpycanuck
0
74
Other Decks in Programming
See All in Programming
めざせ!WKWebViewマスター! / WKWebView Master
marcy731
3
480
GoのIteratorに詳しくなってしまう
inatonix
1
170
マルチモジュールにおけるテスト最適化
fxwx23
0
110
長期運用プロダクトの開発速度を維持し続けるためのリファクタリング実践例
wataruss
8
2.5k
Kotlin 2.0 and Beyond
antonarhipov
2
130
dRuby 入門者によるあなたの身近にあるdRuby 入門
makicamel
4
340
フロントエンドカンファレンス北海道2024 『小規模サイトでも使えるVite 〜HTMLコーディングをよりスマートに〜』長谷川広武(ハム)
h2ham
1
2.5k
労務ドメインを快適に開発する方法 / How to Comfortably Develop in the Labor Domain
yuki21
1
250
Regular Expressions, REXML, Automata Learning
makenowjust
0
180
令和トラベルにおけるLLM活用事例:社内ツール開発から得た学びと実践
ippo012
0
110
楽しく簡単に!QRコードの読み取り機能を実装しよう
penguinsan_pg
1
190
オートマトン学習しろ / Do automata learning
makenowjust
3
100
Featured
See All Featured
Designing for humans not robots
tammielis
248
25k
Teambox: Starting and Learning
jrom
131
8.7k
We Have a Design System, Now What?
morganepeng
48
7.1k
The Cult of Friendly URLs
andyhume
76
5.9k
XXLCSS - How to scale CSS and keep your sanity
sugarenia
246
1.3M
Visualizing Your Data: Incorporating Mongo into Loggly Infrastructure
mongodb
38
9.1k
Speed Design
sergeychernyshev
18
400
The Invisible Customer
myddelton
119
13k
WebSockets: Embracing the real-time Web
robhawkes
59
7.3k
ReactJS: Keep Simple. Everything can be a component!
pedronauck
662
120k
A Tale of Four Properties
chriscoyier
155
22k
Templates, Plugins, & Blocks: Oh My! Creating the theme that thinks of everything
marktimemedia
24
2k
Transcript
“You’ve decided to Use Git as Your VCS for Your
Team...So Now What?” Chris Hartjes -- Moontoast
$progStartYear = 1982; $firstComputer = ‘VIC-20’; $phpStartYear = 1998;
High-traffic online dating Sports data integration Social commerce platform
None
None
News feed • at a glance see who’s been doing
things • see exactly what’s been done
Access control • makes it easy to add outside contributors
via public keys • control who has access to specific repos
Web-based viewing • CLI sucks for looking at code changes
• Tweaking of web UI always working towards smoother experience
None
None
None
None
None
• master • stage • uatX • feature branches •
hotfix branches
Contains only code in production master branch
stage branch
uatX branches
feature branches
chartjes@marmalade [~/pi] -> % git checkout -b feature-git-summit Switched to
a new branch 'feature-git-summit' chartjes@marmalade [~/pi] -> % * choose consistent naming scheme * Moontoast uses project milestone name * ALWAYS create off of master branch
hotfix branches
chartjes@marmalade [~/pi] -> % git checkout master Switched to branch
'master' chartjes@marmalade [~/pi] -> % git checkout -b hotfix-1234-git-summit Switched to a new branch 'hotfix-1234-git-summit' chartjes@marmalade [~/pi] -> % * always named after ticket number * ALWAYS create off of master branch
None
Merging branches chartjes@marmalade [~/pi] -> % git checkout feature-git-summit Switched
to branch 'feature-git-summit' chartjes@marmalade [~/pi] -> % git merge --no-ff master
Care and feeding for your branches
• long-running feature branches increase risk of nasty conflicts •
best practice is to merge master INTO feature branches EVERY time a production push occurs
Integration with deployment tools
None
Whiskey Disk • https://github.com/flogic/whiskey_disk • “Embarrassingly fast deployments”
• updates code-in-place via ‘git pull’ • runs shell scripts
to perform other duties • encourages practice of separate repo for configuration files for your application Whiskey Disk
Other Git aware tools • Capistrano (Ruby but not Ruby
only) • Jenkins (CI server) • Deployinator (open sourced by Etsy)
How did Moontoast do it again?
Used GitHub • self-hosting Git repos requires resources • management
tools make a huge difference • GitHub API allows for innovative solutions
Branch-and-Merge • allows for parallel development • branching is a
“cheap” behaviour • be careful with long-running branches • DON’T CROSS THE STREAMS
Git-aware deployments • Most modern tools support Git • GitHub
API FTW (IRC bot that deploys?)
Thank you! • @grmpyprogrammer • http://www.littlehart.net/atthekeyboard