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
Git 201
Search
Dimitris Tsironis
May 31, 2013
Technology
0
180
Git 201
Branching Models basic, Merging & how Github's pull request work
Dimitris Tsironis
May 31, 2013
Tweet
Share
More Decks by Dimitris Tsironis
See All by Dimitris Tsironis
Introduction to Digigov SDK
tsironis
0
43
How to Develop Backbone Plugins (...for the greater good!)
tsironis
0
260
Modern Webapps
tsironis
1
97
Automating your workflow with Grunt
tsironis
2
190
Git 101
tsironis
0
220
Capistrano for non-Rubyists
tsironis
4
140
HTML+CSS: how to get started
tsironis
1
79
Coffeescript: unfancy javascript
tsironis
2
460
Coffescript - take a sip of code
tsironis
4
170
Other Decks in Technology
See All in Technology
Oracle Base Database Service 技術詳細
oracle4engineer
PRO
14
82k
OPENLOGI Company Profile for engineer
hr01
1
45k
デザインとエンジニアリングの架け橋を目指す OPTiMのデザインシステム「nucleus」の軌跡と広げ方
optim
0
120
webpack依存からの脱却!快適フロントエンド開発をViteで実現する #vuefes
bengo4com
4
3.6k
re:Inventに行くまでにやっておきたいこと
nagisa53
0
570
ソースを読む時の思考プロセスの例-MkDocs
sat
PRO
1
290
NLPコロキウム20251022_超効率化への挑戦: LLM 1bit量子化のロードマップ
yumaichikawa
3
540
Zero Trust DNS でより安全なインターネット アクセス
murachiakira
0
110
SCONE - 動画配信の帯域を最適化する新プロトコル
kazuho
1
400
AI駆動で進める依存ライブラリ更新 ─ Vue プロジェクトの品質向上と開発スピード改善の実践録
sayn0
1
330
AI機能プロジェクト炎上の 3つのしくじりと学び
nakawai
0
120
可観測性は開発環境から、開発環境にもオブザーバビリティ導入のススメ
layerx
PRO
4
1.5k
Featured
See All Featured
CSS Pre-Processors: Stylus, Less & Sass
bermonpainter
359
30k
[RailsConf 2023] Rails as a piece of cake
palkan
57
5.9k
We Have a Design System, Now What?
morganepeng
53
7.8k
How to Ace a Technical Interview
jacobian
280
24k
Stop Working from a Prison Cell
hatefulcrawdad
272
21k
"I'm Feeling Lucky" - Building Great Search Experiences for Today's Users (#IAC19)
danielanewman
230
22k
Unsuck your backbone
ammeep
671
58k
Improving Core Web Vitals using Speculation Rules API
sergeychernyshev
21
1.2k
How to Think Like a Performance Engineer
csswizardry
27
2.1k
Embracing the Ebb and Flow
colly
88
4.9k
Designing Experiences People Love
moore
142
24k
GitHub's CSS Performance
jonrohan
1032
470k
Transcript
Git 201 FreeFriday @ Teipir
Real quick...
Dimitris Tsironis Front-end Engineer at BugSense, JavaScript lover || hater,
Open-source & (Coffee)Script addict, Technology afficcionado
Previously on Free Fridays...
How can we work more effectively in a team?
Introducing Branching have multiple versions of the same project work
async & simultaneously safer & more clean way to do things very “cheap” branches
Git This is where the Git magic is happening!
creating a branch $ git branch <new-branch-name> # Creates a
new branch $ git checkout <new-branch-name> # Switch to new branch $ git branch # Check your local branches
creating a branch #2 # Creates a new branch and
switches to it immediately $ git checkout -b <new-branch-name>
Now, you can code as hard as you can!
Cool story, bro! But, how can we move our code
to our main branch and continue with our lives?
Merging Merge two branches Keep the chances you want to
keep You’re in control It’s easier in Git than in other VCS
merging a local branch $ git checkout <dest-branch> # Switch
to destination $ git merge <branch-name> # Merge the specified branch $ git log # Check if everything is fine
Once you’ve finished... You should do some housekeeping!
deleting a branch # Deletes branch, but keeps commits $
git branch -d <branch-name> # Force deletes everything, both branch and its commits $ git branch -D <branch-name> # USE WISELY!!
The Github way How Github handles branches & merging
Branches on Github Nothing special here Push your branches on
Github Has some awesome tools for branches
pushing to Github # Push branch on Github $ git
push origin <branch-name>
Pull Requests A nice, Web 2.0 way to handle merges,
branch and working in a team
Pull requests Promoting collaboration Encouraging open source contributions (fork) Discussing
features & changes on the go Merge without hassle and delete the branch
The real power is in the details! Let’s see...
Pull requests: reloaded Discussion for almost everything Can be created
before coding starts You have a timeline history of commits Forum-like functionality lots of integrations and extra tools
Extra tig (apt-get install tig, brew install tig) Github Help
Git basics presentation Git documentation
And, as always, practice, practice, PRACTICE!
Thanks! @tsironakos