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

Using Git and GitHub Effectively at Emerge Inte...

Avatar for Matthew McCullough Matthew McCullough
September 04, 2012
Programming
3
220

Using Git and GitHub Effectively at Emerge Interactive

Matthew presented on some lesser-known Git and GitHub tactics at Emerge Interactive in Portland, OR on 2012-09-04.

Detailed notes are in a Gist on GitHub: https://gist.github.com/gists/3642254
Avatar for Matthew McCullough

Matthew McCullough

September 04, 2012
Tweet

More Decks by Matthew McCullough

See All by Matthew McCullough
Patterns for Collaborative Software Development in a Social World at JavaOne 2015
Avatar for Matthew McCullough matthewmccullough
1
390
Collaborative Software Development in a Social World at the Utah JUG
Avatar for Matthew McCullough matthewmccullough
2
170
Git and GitHub Platform Review
Avatar for Matthew McCullough matthewmccullough
1
490
Your First Pull Request
Avatar for Matthew McCullough matthewmccullough
0
290
Git and GitHub Workflows at the Utah JUG
Avatar for Matthew McCullough matthewmccullough
1
820
Agile-ish life at GitHub
Avatar for Matthew McCullough matthewmccullough
2
390
Git and GitHub Agile Workflows for HP
Avatar for Matthew McCullough matthewmccullough
0
300
Writing Tools on the GitHub Platform
Avatar for Matthew McCullough matthewmccullough
0
270
Git Feature Branches as an Art
Avatar for Matthew McCullough matthewmccullough
0
170

Other Decks in Programming

See All in Programming
Cline指示通りに動かない？ AI小説エージェントで学ぶ指示書の書き方と自動アップデートの仕組み
Avatar for 葦沢かもめ kamomeashizawa
1
570
SODA - FACT BOOK
Avatar for SODA inc. sodainc
1
1.1k
Enterprise Web App. Development (2): Version Control Tool Training Ver. 5.1
Avatar for Koichi NAKAGAWA knakagawa
1
120
ドメインモデリングにおける抽象の役割、tagless-finalによるDSL構築、そして型安全な最適化
Avatar for Kenichi SUZUKI knih
11
2k
Result型で“失敗”を型にするPHPコードの書き方
Avatar for Takuma Kajikawa kajitack
4
120
[初登壇＠jAZUG]アプリ開発者が気になるGoogleCloud/Azure＋wasm/wasi
Avatar for asaringo asaringo
0
130
DroidKnights 2025 - 다양한 스크롤 뷰에서의 영상 재생
Avatar for 이가은 gaeun5744
3
300
レガシーシステムの機能調査・開発におけるAI利活用
Avatar for takuya ohtonari takuya_ohtonari
0
610
Webからモバイルへ Vue.js × Capacitor 活用事例
Avatar for Naoki Haba naokihaba
0
750
CursorはMCPを使った方が良いぞ
Avatar for taiga taigakono
0
150
git worktree × Claude Code × MCP ～生成AI時代の並列開発フロー～
Avatar for hisuzuya hisuzuya
0
280
Datadog RUM 本番導入までの道
Avatar for Shintaro Matsumoto shinter61
1
310

Featured

See All Featured
Art, The Web, and Tiny UX
Avatar for Lynn Fisher lynnandtonic
299
21k
Automating Front-end Workflow
Avatar for Addy Osmani addyosmani
1370
200k
Reflections from 52 weeks, 52 projects
Avatar for Jefferson Lam jeffersonlam
351
20k
The Straight Up "How To Draw Better" Workshop
Avatar for Dennis Kardys denniskardys
233
140k
Designing Dashboards & Data Visualisations in Web Apps
Avatar for Des Traynor destraynor
231
53k
Speed Design
Avatar for Sergey Chernyshev sergeychernyshev
31
1k
[RailsConf 2023 Opening Keynote] The Magic of Rails
Avatar for Eileen M. Uchitelle eileencodes
29
9.5k
"I'm Feeling Lucky" - Building Great Search Experiences for Today's Users (#IAC19)
Avatar for Dan Newman danielanewman
228
22k
The Invisible Side of Design
Avatar for Vitaly Friedman smashingmag
299
51k
Building Better People: How to give real-time feedback that sticks.
Avatar for Will Jessup wjessup
367
19k
10 Git Anti Patterns You Should be Aware of
Avatar for Lemi Orhan Ergin lemiorhan
PRO
657
60k
Scaling GitHub
Avatar for Zach Holman holman
459
140k

Transcript

  1. GIT AND GITHUB Using Distributed Version Control effectively at Using

    Distributed Version Control effectively at

  2. [email protected] github.com/training @matthewmccull matthewmccullough

  3. Who is Matthew? Open source contributor Build tool and continuous

    delivery author 5 year Git evangelist VP of Training at GitHub
  4. None
  5. None
  6. None
  7. None

  8. Rebasing

  9. Push and Pull

  10. Rerere

  11. Rebase onto

  12. pickaxe

  13. blame

  14. Continuous Delivery

  15. local commits

  16. pull requests

  17. allow for RDD

  18. peer review

  19. simpler merges

  20. None
  21. None
  22. None
  23. None

  24. reduce friction

  25. trust tests

  26. Hub

  27. ghi

  28. Thanks!

  29. [email protected] github.com/training @matthewmccull matthewmccullough