Upgrade to Pro — share decks privately, control downloads, hide ads and more …

git hygiene

elise_huard
May 02, 2012
Programming
3
390

git hygiene

a small description of how to keep your git tree tidy

elise_huard

May 02, 2012
Tweet

More Decks by elise_huard

See All by elise_huard
FRP in games
elise_huard
0
170
Game in Haskell at Strangeloop 2014
elise_huard
4
510
Functional Programming is the new black
elise_huard
4
1.2k
Tracing your way through Ruby
elise_huard
4
530
Ruby's bin men
elise_huard
1
150
Ruby's bin men
elise_huard
2
950
data driven development
elise_huard
5
250
Data Driven Development
elise_huard
3
430
Ruby goes to Hollywood
elise_huard
1
530

Other Decks in Programming

See All in Programming
OpenTelemetryでRailsのパフォーマンス分析を始めてみよう（KoR2024）
ymtdzzz
4
1.6k
讓數據說話：用 Python、Prometheus 和 Grafana 講故事
eddie
0
350
CSC305 Lecture 13
javiergs
PRO
0
130
詳細解説！ ArrayListの仕組みと実装
yujisoftware
0
480
offers_20241022_imakiire.pdf
imakurusu
2
360
VR HMDとしてのVision Pro＋ゲーム開発について
yasei_no_otoko
0
100
Realtime API 入門
riofujimon
0
110
推し活としてのrails new/oshikatsu_ha_iizo
sakahukamaki
3
1.7k
【Kaigi on Rails 2024】YOUTRUST スポンサーLT
krpk1900
1
250
Streams APIとTCPフロー制御 / Web Streams API and TCP flow control
tasshi
1
290
LLM生成文章の精度評価自動化とプロンプトチューニングの効率化について
layerx
PRO
2
140
Synchronizationを支える技術
s_shimotori
1
150

Featured

See All Featured
Building Applications with DynamoDB
mza
90
6.1k
Intergalactic Javascript Robots from Outer Space
tanoku
268
27k
Six Lessons from altMBA
skipperchong
26
3.5k
The Art of Programming - Codeland 2020
erikaheidi
51
13k
The Cost Of JavaScript in 2023
addyosmani
45
6.6k
How STYLIGHT went responsive
nonsquared
95
5.2k
Rebuilding a faster, lazier Slack
samanthasiow
79
8.6k
We Have a Design System, Now What?
morganepeng
50
7.2k
[RailsConf 2023] Rails as a piece of cake
palkan
51
4.9k
The MySQL Ecosystem @ GitHub 2015
samlambert
250
12k
GraphQLの誤解/rethinking-graphql
sonatard
66
9.9k
The Myth of the Modular Monolith - Day 2 Keynote - Rails World 2024
eileencodes
14
1.9k

Transcript

  1. Git hygiene Forward First Tuesdays 01/05/2012 Wednesday, 2 May 12

  2. The problem Wednesday, 2 May 12

  3. Wednesday, 2 May 12

  4. merge foobars + messy tree Wednesday, 2 May 12

  5. Solution Wednesday, 2 May 12

  6. avoid large merges: git pull --rebase ATFT Wednesday, 2 May

    12

  7. git commit often Wednesday, 2 May 12

  8. http://whatthecommit.com/ Wednesday, 2 May 12

  9. git push often (after git pull --rebase!) Wednesday, 2 May

    12

  10. disruptive features Wednesday, 2 May 12

  11. 1. feature branches Wednesday, 2 May 12

  12. squash commits (git rebase -i) git merge -no-ff Wednesday, 2

    May 12

  13. Wednesday, 2 May 12

  14. 2. keep it in master switch the feature on or

    off in the code Wednesday, 2 May 12

  15. Conclusion: - avoid errors - an expressive git tree Wednesday,

    2 May 12

  16. ... Doesn’t take a lot of effort! Wednesday, 2 May

    12