Upgrade to Pro
— share decks privately, control downloads, hide ads and more …
Speaker Deck
Sign up for free
Menu
Search
Features
All features
Private URLs
Password Protection
Custom URLS
Scheduled publishing
Remove Branding
Restrict embedding
Deck Collections
Notes
Features
All features
Private URLs
Password Protection
Custom URLS
Scheduled publishing
Remove Branding
Restrict embedding
Deck Collections
Notes
Explore
Featured decks
Featured speakers
Programming
Technology
Storyboards
Explore
Featured decks
Featured speakers
Programming
Technology
Storyboards
Pricing
Search
Sign in
Sign up for free
git hygiene
Search
elise_huard
May 02, 2012
Programming
430
3
Share
Embed
Copy iframe code
Copy JS code
Copy link
Start on current slide
git hygiene
a small description of how to keep your git tree tidy
elise_huard
May 02, 2012
Transcript
16 slides
Git hygiene Forward First Tuesdays 01/05/2012 Wednesday, 2 May 12
The problem Wednesday, 2 May 12
Wednesday, 2 May 12
merge foobars + messy tree Wednesday, 2 May 12
Solution Wednesday, 2 May 12
avoid large merges: git pull --rebase ATFT Wednesday, 2 May
12
git commit often Wednesday, 2 May 12
http://whatthecommit.com/ Wednesday, 2 May 12
git push often (after git pull --rebase!) Wednesday, 2 May
12
disruptive features Wednesday, 2 May 12
1. feature branches Wednesday, 2 May 12
squash commits (git rebase -i) git merge -no-ff Wednesday, 2
May 12
Wednesday, 2 May 12
2. keep it in master switch the feature on or
off in the code Wednesday, 2 May 12
Conclusion: - avoid errors - an expressive git tree Wednesday,
2 May 12
... Doesn’t take a lot of effort! Wednesday, 2 May
12
More Decks by elise_huard
See All by elise_huard
FRP in games
elise_huard
0
220
Game in Haskell at Strangeloop 2014
elise_huard
4
550
Functional Programming is the new black
elise_huard
4
1.3k
Tracing your way through Ruby
elise_huard
4
560
Ruby's bin men
elise_huard
1
180
Ruby's bin men
elise_huard
2
1k
data driven development
elise_huard
5
280
Data Driven Development
elise_huard
3
470
Ruby goes to Hollywood
elise_huard
1
600
Other Decks in Programming
See All in Programming
graphql-ruby を Spinel で速くしようとした話
mtsmfm
0
150
Goコンパイラを作ってGoをもっと理解する / Build a Go compiler to better understand Go
ikura_hamu
0
130
プロジェクトコードをキレイキレイしよう!暗黙的な参照を読み解く静的解析
ostk0069
0
220
Debian JP Projectのサーバー構成
uwabami
1
150
Vapor Mode でアクセシビリティは 壊れないか検証した話
fuqda
1
350
Materialが消えた日 〜真っ白なFlutterキャンバスにRenderObjectで絵を描く〜
umigishiaoi
0
170
はじめてのPLATEAU
nokonoko1203
1
660
複数ドメインを一つのアプリに統合するFlutterの設計と運用_FlutterKaigi2026登壇資料(須永高弘)
takahirosunaga
0
200
Enforcing Your Architecture with Unit Tests in the AI Era (Swift Connection X)
steliosf
PRO
1
190
Spec-Driven Development - Why Vaadin Is the Perfect Fit
simas
PRO
0
260
Crash Auto Pipelines
veronikapj
1
440
AIが生成したコードは読むべきか?抽象化設計とコードの品質保証 / abstraction-design-and-quality
minodriven
16
9.4k
Featured
See All Featured
Exploring anti-patterns in Rails
aemeredith
4
570
The Cost Of JavaScript in 2023
addyosmani
56
10k
The Straight Up "How To Draw Better" Workshop
denniskardys
239
140k
Fireside Chat
paigeccino
43
4.1k
What's in a price? How to price your products and services
michaelherold
247
13k
The Curious Case for Waylosing
cassininazir
1
620
Efficient Content Optimization with Google Search Console & Apps Script
katarinadahlin
PRO
1
1k
How to Build an AI Search Optimization Roadmap - Criteria and Steps to Take #SEOIRL
aleyda
1
2.3k
Accessibility Awareness
sabderemane
1
310
Agile Actions for Facilitating Distributed Teams - ADO2019
mkilby
0
350
Automating Front-end Workflow
addyosmani
1370
210k
Mozcon NYC 2025: Stop Losing SEO Traffic
samtorres
1
610